Browse Source

refactor(yqn): 把 YqnDtos 按接口拆成独立文件

原来 1174 行的单个 YqnDtos 装了 63 个内部类,18 个接口的报文混在一起,
改一个接口要在上千行里翻找,共用结构(BatchAttr 之类)也会被误当成
「跨接口共享类型」。

拆成 18 个文件,一个接口一个:
  YqnCreateOrderDtos / YqnOrderDetailDtos / YqnCancelOrderDtos / YqnProductDtos /
  YqnFeeDetailDtos / YqnInventoryDtos / YqnCreateInboundDtos / YqnInboundPlanDtos /
  YqnTransferDtos / YqnCreateSaleReturnDtos / YqnReturnProcessDtos /
  YqnFeeEstimateDtos / YqnTrackingDtos / YqnDestroyPlanDtos / YqnBoxLabelDtos /
  YqnSkuLabelDtos / YqnLogisticsProductDtos / YqnWarehouseDtos

拆分原则:
- 每个文件只放该接口的请求 / 响应与内嵌子结构
- 跨接口重复的结构**各自复制一份**(如 BatchAttr 在入库与调拨里各有一份),
  避免因共用而被迫一起改
- 保留每个类的 @JsonInclude(NON_NULL):它决定空字段是否出现在报文里,
  拆分时漏掉会让请求多出 null 字段(测试已验证并修复)

顺带修一处:TransferMapper 引用的是入库的 BatchAttr,拆分后类型不兼容,
改为使用调拨自己的 BatchAttr。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 2 weeks ago
parent
commit
3d17a27c3f
  1. 8
      README.md
  2. 95
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java
  3. 8
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnBoxLabelMapper.java
  4. 26
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnDestructionMapper.java
  5. 24
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeEstimateMapper.java
  6. 8
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java
  7. 51
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInboundMapper.java
  8. 10
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java
  9. 6
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnLogisticsProductMapper.java
  10. 85
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java
  11. 16
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnProductMapper.java
  12. 21
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java
  13. 9
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnSkuLabelMapper.java
  14. 16
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnTrackingMapper.java
  15. 37
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnTransferMapper.java
  16. 6
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnWarehouseMapper.java
  17. 44
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnBoxLabelDtos.java
  18. 27
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCancelOrderDtos.java
  19. 141
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateInboundDtos.java
  20. 177
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateOrderDtos.java
  21. 49
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateSaleReturnDtos.java
  22. 56
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDestroyPlanDtos.java
  23. 1174
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java
  24. 48
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnFeeDetailDtos.java
  25. 77
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnFeeEstimateDtos.java
  26. 87
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnInboundPlanDtos.java
  27. 91
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnInventoryDtos.java
  28. 27
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnLogisticsProductDtos.java
  29. 148
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnOrderDetailDtos.java
  30. 120
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnProductDtos.java
  31. 31
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnReturnProcessDtos.java
  32. 40
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnSkuLabelDtos.java
  33. 85
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnTrackingDtos.java
  34. 108
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnTransferDtos.java
  35. 33
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnWarehouseDtos.java

8
README.md

@ -327,6 +327,14 @@ common.ecommerce @@ -327,6 +327,14 @@ common.ecommerce
│ WarehouseConnection(主基址 + 可选辅助基址)/ WarehouseWriteScope
│
├── yqn 运去哪三方仓(warehouse-sdk-yqn)
│ ├── dto (按接口拆分,一个接口一个文件)
│ │ YqnCreateOrderDtos / YqnOrderDetailDtos / YqnCancelOrderDtos /
│ │ YqnProductDtos / YqnFeeDetailDtos / YqnInventoryDtos /
│ │ YqnCreateInboundDtos / YqnInboundPlanDtos / YqnTransferDtos /
│ │ YqnCreateSaleReturnDtos / YqnReturnProcessDtos /
│ │ YqnFeeEstimateDtos / YqnTrackingDtos / YqnDestroyPlanDtos /
│ │ YqnBoxLabelDtos / YqnSkuLabelDtos /
│ │ YqnLogisticsProductDtos / YqnWarehouseDtos
│ ├── YqnConstants 端点、路径、固定 token 请求头名、限流
│ ├── adapter YqnAdapter(P1 出库) / YqnAdapterFactory / YqnOutboundMapper
│ ├── dto YqnDtos(字段级契约待打样核对)

95
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java

@ -1,5 +1,23 @@ @@ -1,5 +1,23 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnBoxLabelDtos;
import common.ecommerce.yqn.dto.YqnCancelOrderDtos;
import common.ecommerce.yqn.dto.YqnCreateInboundDtos;
import common.ecommerce.yqn.dto.YqnCreateOrderDtos;
import common.ecommerce.yqn.dto.YqnCreateSaleReturnDtos;
import common.ecommerce.yqn.dto.YqnDestroyPlanDtos;
import common.ecommerce.yqn.dto.YqnFeeDetailDtos;
import common.ecommerce.yqn.dto.YqnFeeEstimateDtos;
import common.ecommerce.yqn.dto.YqnInboundPlanDtos;
import common.ecommerce.yqn.dto.YqnInventoryDtos;
import common.ecommerce.yqn.dto.YqnLogisticsProductDtos;
import common.ecommerce.yqn.dto.YqnOrderDetailDtos;
import common.ecommerce.yqn.dto.YqnProductDtos;
import common.ecommerce.yqn.dto.YqnReturnProcessDtos;
import common.ecommerce.yqn.dto.YqnSkuLabelDtos;
import common.ecommerce.yqn.dto.YqnTrackingDtos;
import common.ecommerce.yqn.dto.YqnTransferDtos;
import common.ecommerce.yqn.dto.YqnWarehouseDtos;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.HttpTransport;
@ -60,7 +78,6 @@ import common.ecommerce.warehouse.model.OutboundRef; @@ -60,7 +78,6 @@ import common.ecommerce.warehouse.model.OutboundRef;
import common.ecommerce.warehouse.model.PackageResult;
import common.ecommerce.warehouse.sdk.WarehouseContext;
import common.ecommerce.yqn.YqnConstants;
import common.ecommerce.yqn.dto.YqnDtos;
import common.ecommerce.yqn.http.YqnEnvelope;
import common.ecommerce.yqn.http.YqnRateLimiter;
import common.ecommerce.yqn.http.YqnRequestFactory;
@ -79,7 +96,7 @@ import java.util.Map; @@ -79,7 +96,7 @@ import java.util.Map;
* 等在 P2/P3 接入,未实现的能力位不声明,门面调用会显式拒绝。</p>
*
* <p>字段级契约待打样核对(Spec §8.6):本类只做「拼请求 + 解析响应」,
* 字段差异收敛在 {@link YqnDtos} 与 {@link YqnOutboundMapper}。</p>
* 字段差异收敛在 {@code Yqn*Dtos}(按接口拆分) 与 {@link YqnOutboundMapper}。</p>
*/
public final class YqnAdapter implements OutboundCapable, WarehouseProductCapable,
WarehouseFeeCapable, WarehouseFeeEstimateCapable, InventoryCapable, InboundCapable,
@ -142,7 +159,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -142,7 +159,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public ProductResult createOrUpdate(WarehouseContext ctx, WarehouseProduct product) {
YqnDtos.SaveProductRequest body = YqnProductMapper.toRequest(product);
YqnProductDtos.SaveProductRequest body = YqnProductMapper.toRequest(product);
String raw = execute(ctx, YqnConstants.PATH_PRODUCT_SAVE, body, "warehouse.product.create");
return ProductResult.of(YqnProductMapper.skuOf(product), "SAVED",
json.stringAt(raw, "message"));
@ -154,7 +171,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -154,7 +171,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
public OutboundReceipt create(WarehouseContext ctx, OutboundCommand cmd) {
requirePlatformLabelSupported(ctx, cmd.labelMode());
requireLabelContentForPlatformLabel(cmd);
YqnDtos.CreateOrderRequest body = YqnOutboundMapper.toRequest(cmd, warehouseId(ctx, cmd.warehouseId()));
YqnCreateOrderDtos.CreateOrderRequest body = YqnOutboundMapper.toRequest(cmd, warehouseId(ctx, cmd.warehouseId()));
String raw = execute(ctx, YqnConstants.PATH_ORDER_CREATE, body, "warehouse.outbound.create");
// API 123 只回 data.orderId(仓内部数字 id),不回字符串单号
@ -178,7 +195,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -178,7 +195,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
public OutboundOrder get(WarehouseContext ctx, OutboundRef ref) {
// API 128 只按来源单号查;仓内部 id 查不了,调用方要给 outboundRequestNo
String orderNo = orderNoOf(ref);
YqnDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.get");
YqnOrderDetailDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.get");
return detail == null ? null
: YqnOutboundMapper.toOrder(detail, null, null, ctx.warehouseCode(), zoneOf(ctx));
}
@ -206,22 +223,22 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -206,22 +223,22 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
.requestId(ctx.requestId())
.retryable(false));
}
YqnDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.query");
YqnOrderDetailDtos.OrderDetail detail = findOne(ctx, orderNo, "warehouse.outbound.query");
return detail == null ? Page.<OutboundOrder>empty()
: Page.last(java.util.Collections.singletonList(
YqnOutboundMapper.toOrder(detail, null, null, ctx.warehouseCode(), zoneOf(ctx))));
}
/** 调 findOne 并解析 data;订单不存在时返回 null。 */
private YqnDtos.OrderDetail findOne(WarehouseContext ctx, String orderNo, String operation) {
YqnDtos.FindOneOrderRequest body = new YqnDtos.FindOneOrderRequest();
private YqnOrderDetailDtos.OrderDetail findOne(WarehouseContext ctx, String orderNo, String operation) {
YqnOrderDetailDtos.FindOneOrderRequest body = new YqnOrderDetailDtos.FindOneOrderRequest();
body.orderNo = orderNo;
String raw = execute(ctx, YqnConstants.PATH_ORDER_FIND_ONE, body, operation);
com.fasterxml.jackson.databind.JsonNode data = json.nodeAt(raw, "data");
if (data == null || data.isNull() || data.isMissingNode()) {
return null;
}
return json.fromJson(data.toString(), YqnDtos.OrderDetail.class);
return json.fromJson(data.toString(), YqnOrderDetailDtos.OrderDetail.class);
}
/** 统一引用 → 运去哪订单号(来源单号)。 */
@ -269,7 +286,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -269,7 +286,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public CancelResult cancel(WarehouseContext ctx, CancelCommand cmd) {
YqnDtos.CancelOrderRequest body = new YqnDtos.CancelOrderRequest();
YqnCancelOrderDtos.CancelOrderRequest body = new YqnCancelOrderDtos.CancelOrderRequest();
body.orderNo = orderNoOf(cmd);
String raw;
@ -307,7 +324,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -307,7 +324,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
@Override
public List<PackageResult> packages(WarehouseContext ctx, OutboundRef ref) {
YqnDtos.OrderDetail detail = findOne(ctx, orderNoOf(ref), "warehouse.outbound.packages");
YqnOrderDetailDtos.OrderDetail detail = findOne(ctx, orderNoOf(ref), "warehouse.outbound.packages");
return detail == null ? java.util.Collections.<PackageResult>emptyList()
: YqnOutboundMapper.toPackages(detail);
}
@ -323,11 +340,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -323,11 +340,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public List<BillingDocument> settlements(WarehouseContext ctx, FeeQuery query) {
YqnDtos.CostDetailRequest body = YqnFeeMapper.toRequest(query);
YqnFeeDetailDtos.CostDetailRequest body = YqnFeeMapper.toRequest(query);
String raw = execute(ctx, YqnConstants.PATH_FEE_DETAIL, body, "warehouse.fee.settlements");
List<YqnDtos.CostDetail> rows = json.listAt(raw, "data", YqnDtos.CostDetail.class);
List<YqnFeeDetailDtos.CostDetail> rows = json.listAt(raw, "data", YqnFeeDetailDtos.CostDetail.class);
List<BillingDocument> out = new ArrayList<BillingDocument>(rows.size());
for (YqnDtos.CostDetail row : rows) {
for (YqnFeeDetailDtos.CostDetail row : rows) {
out.add(YqnFeeMapper.toDocument(row, ctx.warehouseCode(), zoneOf(ctx)));
}
return out;
@ -341,12 +358,12 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -341,12 +358,12 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public List<FeeEstimateResult> estimate(WarehouseContext ctx, FeeEstimateQuery query) {
YqnDtos.CalculateRequest body =
YqnFeeEstimateDtos.CalculateRequest body =
YqnFeeEstimateMapper.toRequest(query, ctx.providerWarehouseId());
String raw = execute(ctx, YqnConstants.PATH_FEE_ESTIMATE, body, "warehouse.fee.estimate");
List<YqnDtos.CalculateResult> rows = json.listAt(raw, "data", YqnDtos.CalculateResult.class);
List<YqnFeeEstimateDtos.CalculateResult> rows = json.listAt(raw, "data", YqnFeeEstimateDtos.CalculateResult.class);
List<FeeEstimateResult> out = new ArrayList<FeeEstimateResult>(rows.size());
for (YqnDtos.CalculateResult row : rows) {
for (YqnFeeEstimateDtos.CalculateResult row : rows) {
out.add(YqnFeeEstimateMapper.toResult(row));
}
return out;
@ -380,7 +397,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -380,7 +397,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
HttpResponse resp = transport.execute(req);
String raw = YqnEnvelope.of(resp, json, "warehouse.inventory.query",
ctx.warehouseCode(), ctx.requestId()).body();
YqnDtos.InventoryPage page = json.fromJson(raw, YqnDtos.InventoryPage.class);
YqnInventoryDtos.InventoryPage page = json.fromJson(raw, YqnInventoryDtos.InventoryPage.class);
return YqnInventoryMapper.toPage(page, ctx.providerWarehouseId(), zoneOf(ctx), query.cursor());
}
@ -395,7 +412,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -395,7 +412,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
@Override
public InboundReceipt create(WarehouseContext ctx, InboundCommand cmd) {
String warehouseCode = firstNonBlank(cmd.warehouseId(), ctx.providerWarehouseId());
YqnDtos.CreateInboundPlanRequest body = YqnInboundMapper.toRequest(cmd, warehouseCode);
YqnCreateInboundDtos.CreateInboundPlanRequest body = YqnInboundMapper.toRequest(cmd, warehouseCode);
String raw = execute(ctx, YqnConstants.PATH_INBOUND_CREATE, body, "warehouse.inbound.create");
String planNo = json.stringAt(raw, "data.inboundPlanOrderNo");
return InboundReceipt.of(cmd.inboundRequestNo(), planNo);
@ -409,14 +426,14 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -409,14 +426,14 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public InboundOrder get(WarehouseContext ctx, String inboundRef) {
YqnDtos.GetInboundPlanRequest body = new YqnDtos.GetInboundPlanRequest();
YqnInboundPlanDtos.GetInboundPlanRequest body = new YqnInboundPlanDtos.GetInboundPlanRequest();
body.orderNo = inboundRef;
String raw = execute(ctx, YqnConstants.PATH_INBOUND_GET, body, "warehouse.inbound.get");
com.fasterxml.jackson.databind.JsonNode data = json.nodeAt(raw, "data");
if (data == null || data.isNull() || data.isMissingNode()) {
return null;
}
YqnDtos.InboundPlanInfo info = json.fromJson(data.toString(), YqnDtos.InboundPlanInfo.class);
YqnInboundPlanDtos.InboundPlanInfo info = json.fromJson(data.toString(), YqnInboundPlanDtos.InboundPlanInfo.class);
return YqnInboundMapper.toOrder(info, ctx.warehouseCode(), zoneOf(ctx));
}
@ -454,7 +471,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -454,7 +471,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public TransferOrder create(WarehouseContext ctx, TransferCommand cmd) {
YqnDtos.CreateTransferPlanRequest body = YqnTransferMapper.toRequest(cmd);
YqnTransferDtos.CreateTransferPlanRequest body = YqnTransferMapper.toRequest(cmd);
String raw = execute(ctx, YqnConstants.PATH_TRANSFER_CREATE, body, "warehouse.transfer.create");
com.fasterxml.jackson.databind.JsonNode data = json.nodeAt(raw, "data");
if (data == null || data.isNull() || data.isMissingNode()) {
@ -468,8 +485,8 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -468,8 +485,8 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
.rawResponse(safeRelay(raw))
.build();
}
YqnDtos.CreateTransferPlanResponse resp =
json.fromJson(data.toString(), YqnDtos.CreateTransferPlanResponse.class);
YqnTransferDtos.CreateTransferPlanResponse resp =
json.fromJson(data.toString(), YqnTransferDtos.CreateTransferPlanResponse.class);
return YqnTransferMapper.toOrder(resp, cmd.type(), cmd.transferRequestNo(), zoneOf(ctx));
}
@ -485,7 +502,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -485,7 +502,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
@Override
public WarehouseReturn create(WarehouseContext ctx, ReturnCommand cmd) {
String warehouseCode = firstNonBlank(cmd.warehouseId(), ctx.providerWarehouseId());
YqnDtos.CreateSaleReturnRequest body = YqnReturnMapper.toRequest(cmd, warehouseCode);
YqnCreateSaleReturnDtos.CreateSaleReturnRequest body = YqnReturnMapper.toRequest(cmd, warehouseCode);
execute(ctx, YqnConstants.PATH_RETURN_CREATE, body, "warehouse.return.create");
return YqnReturnMapper.toCreated(cmd, warehouseCode);
}
@ -497,7 +514,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -497,7 +514,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public void process(WarehouseContext ctx, ReturnProcessCommand cmd) {
YqnDtos.SaleReturnProcessRequest body = YqnReturnMapper.toProcessRequest(cmd);
YqnReturnProcessDtos.SaleReturnProcessRequest body = YqnReturnMapper.toProcessRequest(cmd);
execute(ctx, YqnConstants.PATH_RETURN_PROCESS, body, "warehouse.return.process");
}
@ -540,7 +557,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -540,7 +557,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
.build();
}
requireWarehouseListSuccess(ctx, raw);
List<YqnDtos.WarehouseRow> rows = json.listAt(raw, "data", YqnDtos.WarehouseRow.class);
List<YqnWarehouseDtos.WarehouseRow> rows = json.listAt(raw, "data", YqnWarehouseDtos.WarehouseRow.class);
return YqnWarehouseMapper.toWarehouses(rows);
}
@ -594,7 +611,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -594,7 +611,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
HttpResponse resp = transport.execute(req);
String raw = YqnEnvelope.of(resp, json, "warehouse.logistics.products",
ctx.warehouseCode(), ctx.requestId()).body();
List<YqnDtos.CarrierGroup> rows = json.listAt(raw, "data", YqnDtos.CarrierGroup.class);
List<YqnLogisticsProductDtos.CarrierGroup> rows = json.listAt(raw, "data", YqnLogisticsProductDtos.CarrierGroup.class);
return YqnLogisticsProductMapper.toProducts(rows, code);
}
@ -608,11 +625,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -608,11 +625,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public LabelPrintTask printBoxLabel(WarehouseContext ctx, BoxLabelCommand cmd) {
YqnDtos.BoxLabelRequest body = YqnBoxLabelMapper.toRequest(cmd);
YqnBoxLabelDtos.BoxLabelRequest body = YqnBoxLabelMapper.toRequest(cmd);
String raw = execute(ctx, YqnConstants.PATH_INBOUND_BOX_LABEL, body,
"warehouse.inbound.boxLabel");
YqnDtos.BoxLabelResponse resp =
json.fromJson(String.valueOf(json.nodeAt(raw, "data")), YqnDtos.BoxLabelResponse.class);
YqnBoxLabelDtos.BoxLabelResponse resp =
json.fromJson(String.valueOf(json.nodeAt(raw, "data")), YqnBoxLabelDtos.BoxLabelResponse.class);
return YqnBoxLabelMapper.toTask(resp, cmd);
}
@ -623,11 +640,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -623,11 +640,11 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public LabelPrintTask printSkuLabel(WarehouseContext ctx, SkuLabelCommand cmd) {
YqnDtos.SkuLabelRequest body = YqnSkuLabelMapper.toRequest(cmd);
YqnSkuLabelDtos.SkuLabelRequest body = YqnSkuLabelMapper.toRequest(cmd);
String raw = execute(ctx, YqnConstants.PATH_INBOUND_SKU_LABEL, body,
"warehouse.inbound.skuLabel");
YqnDtos.BoxLabelResponse resp =
json.fromJson(String.valueOf(json.nodeAt(raw, "data")), YqnDtos.BoxLabelResponse.class);
YqnBoxLabelDtos.BoxLabelResponse resp =
json.fromJson(String.valueOf(json.nodeAt(raw, "data")), YqnBoxLabelDtos.BoxLabelResponse.class);
return YqnSkuLabelMapper.toTask(resp, cmd);
}
@ -642,7 +659,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -642,7 +659,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
@Override
public DestructionOrder create(WarehouseContext ctx, DestructionCommand cmd) {
String warehouseCode = firstNonBlank(cmd.warehouseId(), ctx.providerWarehouseId());
YqnDtos.CreateDestroyPlanRequest body =
YqnDestroyPlanDtos.CreateDestroyPlanRequest body =
YqnDestructionMapper.toRequest(cmd, ctx.providerWarehouseId());
String raw = execute(ctx, YqnConstants.PATH_DESTRUCTION_CREATE, body,
"warehouse.destruction.create");
@ -670,17 +687,17 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -670,17 +687,17 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
*/
@Override
public TrackingInfo trackShipment(WarehouseContext ctx, String trackingNumber) {
YqnDtos.ShipmentTrack track = fetchTrack(ctx, trackingNumber);
YqnTrackingDtos.ShipmentTrack track = fetchTrack(ctx, trackingNumber);
return YqnTrackingMapper.toTrackingInfo(track, trackingNumber, zoneOf(ctx));
}
@Override
public List<TrackEvent> track(WarehouseContext ctx, String trackingNumber) {
YqnDtos.ShipmentTrack track = fetchTrack(ctx, trackingNumber);
YqnTrackingDtos.ShipmentTrack track = fetchTrack(ctx, trackingNumber);
return YqnTrackingMapper.toTrackEvents(track, trackingNumber, zoneOf(ctx));
}
private YqnDtos.ShipmentTrack fetchTrack(WarehouseContext ctx, String trackingNumber) {
private YqnTrackingDtos.ShipmentTrack fetchTrack(WarehouseContext ctx, String trackingNumber) {
if (trackingNumber == null || trackingNumber.trim().isEmpty()) {
throw new IllegalArgumentException("trackingNumber must not be blank");
}
@ -719,7 +736,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl @@ -719,7 +736,7 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl
.build();
}
String data = String.valueOf(json.nodeAt(raw, "data"));
return json.fromJson(data, YqnDtos.ShipmentTrack.class);
return json.fromJson(data, YqnTrackingDtos.ShipmentTrack.class);
}
private static String urlEncode(String v) {

8
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnBoxLabelMapper.java

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnBoxLabelDtos;
import common.ecommerce.warehouse.enums.LabelDownloadMode;
import common.ecommerce.warehouse.enums.LabelSizeType;
import common.ecommerce.warehouse.enums.LabelsPerPage;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.BoxLabelCommand;
import common.ecommerce.warehouse.model.LabelPrintTask;
import common.ecommerce.yqn.dto.YqnDtos;
/**
* 运去哪入库箱标报文映射(API 99)。
@ -19,8 +19,8 @@ public final class YqnBoxLabelMapper { @@ -19,8 +19,8 @@ public final class YqnBoxLabelMapper {
}
/** 统一命令 → 运去哪请求。 */
public static YqnDtos.BoxLabelRequest toRequest(BoxLabelCommand cmd) {
YqnDtos.BoxLabelRequest req = new YqnDtos.BoxLabelRequest();
public static YqnBoxLabelDtos.BoxLabelRequest toRequest(BoxLabelCommand cmd) {
YqnBoxLabelDtos.BoxLabelRequest req = new YqnBoxLabelDtos.BoxLabelRequest();
req.orderNo = cmd.providerInboundNo();
req.sourceNo = cmd.inboundRequestNo();
req.downloadMode = downloadModeCode(cmd.downloadMode());
@ -32,7 +32,7 @@ public final class YqnBoxLabelMapper { @@ -32,7 +32,7 @@ public final class YqnBoxLabelMapper {
}
/** 响应 → 任务。异步接口只回任务编号,不带文件。 */
public static LabelPrintTask toTask(YqnDtos.BoxLabelResponse resp, BoxLabelCommand cmd) {
public static LabelPrintTask toTask(YqnBoxLabelDtos.BoxLabelResponse resp, BoxLabelCommand cmd) {
return LabelPrintTask.builder()
.sourceProvider(WarehouseProvider.YQN)
.taskNo(resp.taskNo)

26
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnDestructionMapper.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnDestroyPlanDtos;
import common.ecommerce.warehouse.enums.AttachmentType;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.DestructionCommand;
import common.ecommerce.warehouse.model.DestructionOrder;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@ -27,9 +27,9 @@ public final class YqnDestructionMapper { @@ -27,9 +27,9 @@ public final class YqnDestructionMapper {
* @param cmd 统一命令
* @param defaultWarehouseCode 命令未指定仓时的回退仓 code
*/
public static YqnDtos.CreateDestroyPlanRequest toRequest(DestructionCommand cmd,
public static YqnDestroyPlanDtos.CreateDestroyPlanRequest toRequest(DestructionCommand cmd,
String defaultWarehouseCode) {
YqnDtos.CreateDestroyPlanRequest req = new YqnDtos.CreateDestroyPlanRequest();
YqnDestroyPlanDtos.CreateDestroyPlanRequest req = new YqnDestroyPlanDtos.CreateDestroyPlanRequest();
req.warehouseCode = hasText(cmd.warehouseId()) ? cmd.warehouseId() : defaultWarehouseCode;
if (!hasText(req.warehouseCode)) {
throw new IllegalArgumentException(
@ -44,13 +44,13 @@ public final class YqnDestructionMapper { @@ -44,13 +44,13 @@ public final class YqnDestructionMapper {
return req;
}
private static List<YqnDtos.CreateDestroyPlanRequest.DestroyPlanItem> toItems(
private static List<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanItem> toItems(
List<DestructionCommand.DestructionLine> lines) {
List<YqnDtos.CreateDestroyPlanRequest.DestroyPlanItem> items =
new ArrayList<YqnDtos.CreateDestroyPlanRequest.DestroyPlanItem>(lines.size());
List<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanItem> items =
new ArrayList<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanItem>(lines.size());
for (DestructionCommand.DestructionLine line : lines) {
YqnDtos.CreateDestroyPlanRequest.DestroyPlanItem item =
new YqnDtos.CreateDestroyPlanRequest.DestroyPlanItem();
YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanItem item =
new YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanItem();
item.sku = line.providerSku();
item.planQty = line.planQuantity();
items.add(item);
@ -58,16 +58,16 @@ public final class YqnDestructionMapper { @@ -58,16 +58,16 @@ public final class YqnDestructionMapper {
return items;
}
private static List<YqnDtos.CreateDestroyPlanRequest.DestroyPlanAttach> toAttaches(
private static List<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanAttach> toAttaches(
List<DestructionCommand.Attachment> attachments) {
if (attachments == null || attachments.isEmpty()) {
return null;
}
List<YqnDtos.CreateDestroyPlanRequest.DestroyPlanAttach> out =
new ArrayList<YqnDtos.CreateDestroyPlanRequest.DestroyPlanAttach>(attachments.size());
List<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanAttach> out =
new ArrayList<YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanAttach>(attachments.size());
for (DestructionCommand.Attachment attachment : attachments) {
YqnDtos.CreateDestroyPlanRequest.DestroyPlanAttach item =
new YqnDtos.CreateDestroyPlanRequest.DestroyPlanAttach();
YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanAttach item =
new YqnDestroyPlanDtos.CreateDestroyPlanRequest.DestroyPlanAttach();
item.name = attachment.name();
item.remark = attachment.remark();
item.attachType = attachTypeCode(attachment.type());

24
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeEstimateMapper.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnFeeEstimateDtos;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.FeeEstimateQuery;
import common.ecommerce.warehouse.model.FeeEstimateResult;
import common.ecommerce.yqn.dto.YqnDtos;
import java.math.BigDecimal;
import java.util.ArrayList;
@ -32,8 +32,8 @@ public final class YqnFeeEstimateMapper { @@ -32,8 +32,8 @@ public final class YqnFeeEstimateMapper {
* @param query 统一条件(cm / g)
* @param defaultWarehouseCode 调用方未指定仓时的回退仓 code
*/
public static YqnDtos.CalculateRequest toRequest(FeeEstimateQuery query, String defaultWarehouseCode) {
YqnDtos.CalculateRequest req = new YqnDtos.CalculateRequest();
public static YqnFeeEstimateDtos.CalculateRequest toRequest(FeeEstimateQuery query, String defaultWarehouseCode) {
YqnFeeEstimateDtos.CalculateRequest req = new YqnFeeEstimateDtos.CalculateRequest();
req.sizeUnit = SIZE_UNIT_CM;
req.length = toDouble(query.lengthCm());
req.width = toDouble(query.widthCm());
@ -58,7 +58,7 @@ public final class YqnFeeEstimateMapper { @@ -58,7 +58,7 @@ public final class YqnFeeEstimateMapper {
return req;
}
private static List<YqnDtos.CalculateRequest.CalculateSkuItem> toWarehouseItems(
private static List<YqnFeeEstimateDtos.CalculateRequest.CalculateSkuItem> toWarehouseItems(
List<String> warehouseCodes, String defaultWarehouseCode) {
List<String> codes = warehouseCodes;
if (codes == null || codes.isEmpty()) {
@ -70,11 +70,11 @@ public final class YqnFeeEstimateMapper { @@ -70,11 +70,11 @@ public final class YqnFeeEstimateMapper {
throw new IllegalArgumentException(
"yqn fee estimate needs a shipOrgWarehouseCode; none given and account has none");
}
List<YqnDtos.CalculateRequest.CalculateSkuItem> items =
new ArrayList<YqnDtos.CalculateRequest.CalculateSkuItem>(codes.size());
List<YqnFeeEstimateDtos.CalculateRequest.CalculateSkuItem> items =
new ArrayList<YqnFeeEstimateDtos.CalculateRequest.CalculateSkuItem>(codes.size());
for (String code : codes) {
YqnDtos.CalculateRequest.CalculateSkuItem item =
new YqnDtos.CalculateRequest.CalculateSkuItem();
YqnFeeEstimateDtos.CalculateRequest.CalculateSkuItem item =
new YqnFeeEstimateDtos.CalculateRequest.CalculateSkuItem();
item.shipOrgWarehouseCode = code;
items.add(item);
}
@ -82,12 +82,12 @@ public final class YqnFeeEstimateMapper { @@ -82,12 +82,12 @@ public final class YqnFeeEstimateMapper {
}
/** 运去哪一条仓库结果 → 统一结果。 */
public static FeeEstimateResult toResult(YqnDtos.CalculateResult row) {
public static FeeEstimateResult toResult(YqnFeeEstimateDtos.CalculateResult row) {
FeeEstimateResult.Builder builder = FeeEstimateResult.builder()
.sourceProvider(WarehouseProvider.YQN)
.shipOrgWarehouseCode(row.shipOrgWarehouseCode);
if (row.calculationCarrierItems != null) {
for (YqnDtos.CalculateResult.CalculateCarrierItem carrier : row.calculationCarrierItems) {
for (YqnFeeEstimateDtos.CalculateResult.CalculateCarrierItem carrier : row.calculationCarrierItems) {
builder.carrier(toQuote(carrier));
}
}
@ -95,14 +95,14 @@ public final class YqnFeeEstimateMapper { @@ -95,14 +95,14 @@ public final class YqnFeeEstimateMapper {
}
private static FeeEstimateResult.CarrierQuote toQuote(
YqnDtos.CalculateResult.CalculateCarrierItem item) {
YqnFeeEstimateDtos.CalculateResult.CalculateCarrierItem item) {
String currency = hasText(item.currency) ? item.currency.trim() : DEFAULT_CURRENCY;
FeeEstimateResult.CarrierQuote.Builder quote = FeeEstimateResult.CarrierQuote.builder()
.carrier(item.carrier)
.logisticsServiceCode(item.logisticsServiceCode)
.totalRate(item.totalRate == null ? null : money(item.totalRate, currency));
if (item.calculationCostItems != null) {
for (YqnDtos.CalculateResult.CalculateCostItem cost : item.calculationCostItems) {
for (YqnFeeEstimateDtos.CalculateResult.CalculateCostItem cost : item.calculationCostItems) {
quote.costItem(FeeEstimateResult.CarrierQuote.CostItem.builder()
.costName(cost.costName)
.estimatedCost(cost.estimatedCost == null ? null

8
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnFeeMapper.java

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnFeeDetailDtos;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.model.BillingDocument;
import common.ecommerce.warehouse.model.FeeQuery;
import common.ecommerce.warehouse.enums.WarehouseFeeType;
import common.ecommerce.warehouse.sdk.WarehouseContext;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.Instant;
import java.time.LocalDate;
@ -43,12 +43,12 @@ public final class YqnFeeMapper { @@ -43,12 +43,12 @@ public final class YqnFeeMapper {
* <li>{@code saleOrderNo} 在运去哪是数字,非数字直接拒绝——传错类型仓侧会静默查不到</li>
* </ul>
*/
public static YqnDtos.CostDetailRequest toRequest(FeeQuery query) {
public static YqnFeeDetailDtos.CostDetailRequest toRequest(FeeQuery query) {
if (query.isEmpty()) {
throw new IllegalArgumentException(
"yqn fee query requires at least one condition; refusing to pull all costs");
}
YqnDtos.CostDetailRequest req = new YqnDtos.CostDetailRequest();
YqnFeeDetailDtos.CostDetailRequest req = new YqnFeeDetailDtos.CostDetailRequest();
req.saleOrderNo = saleOrderNoOf(query.saleOrderNo());
req.billingTransNo = query.billingTransNo();
req.costType = costTypeOf(query.costType());
@ -112,7 +112,7 @@ public final class YqnFeeMapper { @@ -112,7 +112,7 @@ public final class YqnFeeMapper {
}
/** 一条运去哪费用 → 统一账单。 */
public static BillingDocument toDocument(YqnDtos.CostDetail detail, String warehouseCode, ZoneId zone) {
public static BillingDocument toDocument(YqnFeeDetailDtos.CostDetail detail, String warehouseCode, ZoneId zone) {
return BillingDocument.builder()
.warehouseCode(firstNonBlank(detail.warehouseCode, warehouseCode))
.feeName(detail.costName)

51
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInboundMapper.java

@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnCreateInboundDtos;
import common.ecommerce.yqn.dto.YqnInboundPlanDtos;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.model.InboundBatch;
import common.ecommerce.warehouse.model.InboundCarton;
@ -8,7 +10,6 @@ import common.ecommerce.warehouse.model.InboundLine; @@ -8,7 +10,6 @@ import common.ecommerce.warehouse.model.InboundLine;
import common.ecommerce.warehouse.model.InboundOrder;
import common.ecommerce.warehouse.model.InboundOrderLine;
import common.ecommerce.yqn.enums.YqnInboundStatus;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.Instant;
import java.time.LocalDate;
@ -33,10 +34,10 @@ public final class YqnInboundMapper { @@ -33,10 +34,10 @@ public final class YqnInboundMapper {
}
/** 统一命令 → 运去哪创建入库计划请求。 */
public static YqnDtos.CreateInboundPlanRequest toRequest(InboundCommand cmd, String warehouseCode) {
public static YqnCreateInboundDtos.CreateInboundPlanRequest toRequest(InboundCommand cmd, String warehouseCode) {
requireContainerNo(cmd.containerNo());
YqnDtos.CreateInboundPlanRequest req = new YqnDtos.CreateInboundPlanRequest();
YqnCreateInboundDtos.CreateInboundPlanRequest req = new YqnCreateInboundDtos.CreateInboundPlanRequest();
req.warehouseCode = warehouseCode;
req.orderNo = cmd.inboundRequestNo();
req.inventoryType = cmd.inventoryType();
@ -61,13 +62,13 @@ public final class YqnInboundMapper { @@ -61,13 +62,13 @@ public final class YqnInboundMapper {
return req;
}
private static List<YqnDtos.CreateInboundPlanRequest.InboundProductItem> toProductItems(
private static List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundProductItem> toProductItems(
List<InboundLine> lines) {
List<YqnDtos.CreateInboundPlanRequest.InboundProductItem> items =
new ArrayList<YqnDtos.CreateInboundPlanRequest.InboundProductItem>(lines.size());
List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundProductItem> items =
new ArrayList<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundProductItem>(lines.size());
for (InboundLine line : lines) {
YqnDtos.CreateInboundPlanRequest.InboundProductItem item =
new YqnDtos.CreateInboundPlanRequest.InboundProductItem();
YqnCreateInboundDtos.CreateInboundPlanRequest.InboundProductItem item =
new YqnCreateInboundDtos.CreateInboundPlanRequest.InboundProductItem();
item.sku = skuOf(line.providerSku(), line.omsSku());
item.qty = line.quantity();
Money cost = line.cost();
@ -77,16 +78,16 @@ public final class YqnInboundMapper { @@ -77,16 +78,16 @@ public final class YqnInboundMapper {
return items;
}
private static List<YqnDtos.CreateInboundPlanRequest.InboundCartonItem> toCartonItems(
private static List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundCartonItem> toCartonItems(
List<InboundCarton> cartons) {
if (cartons == null || cartons.isEmpty()) {
return null;
}
List<YqnDtos.CreateInboundPlanRequest.InboundCartonItem> items =
new ArrayList<YqnDtos.CreateInboundPlanRequest.InboundCartonItem>(cartons.size());
List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundCartonItem> items =
new ArrayList<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundCartonItem>(cartons.size());
for (InboundCarton carton : cartons) {
YqnDtos.CreateInboundPlanRequest.InboundCartonItem item =
new YqnDtos.CreateInboundPlanRequest.InboundCartonItem();
YqnCreateInboundDtos.CreateInboundPlanRequest.InboundCartonItem item =
new YqnCreateInboundDtos.CreateInboundPlanRequest.InboundCartonItem();
item.sku = carton.providerSku();
item.qty = carton.quantity();
item.cartonQty = carton.cartonQuantity() > 0 ? carton.cartonQuantity() : null;
@ -101,24 +102,24 @@ public final class YqnInboundMapper { @@ -101,24 +102,24 @@ public final class YqnInboundMapper {
return items;
}
private static List<YqnDtos.CreateInboundPlanRequest.InboundBatchItem> toBatchItems(
private static List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundBatchItem> toBatchItems(
List<InboundBatch> batches) {
if (batches == null || batches.isEmpty()) {
return null;
}
List<YqnDtos.CreateInboundPlanRequest.InboundBatchItem> items =
new ArrayList<YqnDtos.CreateInboundPlanRequest.InboundBatchItem>(batches.size());
List<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundBatchItem> items =
new ArrayList<YqnCreateInboundDtos.CreateInboundPlanRequest.InboundBatchItem>(batches.size());
for (InboundBatch batch : batches) {
YqnDtos.CreateInboundPlanRequest.InboundBatchItem item =
new YqnDtos.CreateInboundPlanRequest.InboundBatchItem();
YqnCreateInboundDtos.CreateInboundPlanRequest.InboundBatchItem item =
new YqnCreateInboundDtos.CreateInboundPlanRequest.InboundBatchItem();
item.sku = batch.providerSku();
item.cartonNo = batch.cartonNo();
item.qty = batch.quantity();
List<YqnDtos.CreateInboundPlanRequest.BatchAttr> params =
new ArrayList<YqnDtos.CreateInboundPlanRequest.BatchAttr>(batch.params().size());
List<YqnCreateInboundDtos.CreateInboundPlanRequest.BatchAttr> params =
new ArrayList<YqnCreateInboundDtos.CreateInboundPlanRequest.BatchAttr>(batch.params().size());
for (InboundBatch.BatchParam param : batch.params()) {
YqnDtos.CreateInboundPlanRequest.BatchAttr attr =
new YqnDtos.CreateInboundPlanRequest.BatchAttr();
YqnCreateInboundDtos.CreateInboundPlanRequest.BatchAttr attr =
new YqnCreateInboundDtos.CreateInboundPlanRequest.BatchAttr();
attr.batchAttriKey = param.key();
attr.batchAttriValue = param.value();
params.add(attr);
@ -158,7 +159,7 @@ public final class YqnInboundMapper { @@ -158,7 +159,7 @@ public final class YqnInboundMapper {
// ------------------------------------------------------------------ 查询
/** 入库计划详情 → 统一入库单(API 101)。 */
public static InboundOrder toOrder(YqnDtos.InboundPlanInfo info, String warehouseCode, ZoneId zone) {
public static InboundOrder toOrder(YqnInboundPlanDtos.InboundPlanInfo info, String warehouseCode, ZoneId zone) {
return InboundOrder.builder()
.inboundRequestNo(firstNonBlank(info.sourceNo, info.inboundPlanOrderNo))
.providerInboundId(info.inboundPlanOrderNo)
@ -184,12 +185,12 @@ public final class YqnInboundMapper { @@ -184,12 +185,12 @@ public final class YqnInboundMapper {
}
private static List<InboundOrderLine> toOrderLines(
List<YqnDtos.InboundPlanInfo.PlanProductDetail> details, ZoneId zone) {
List<YqnInboundPlanDtos.InboundPlanInfo.PlanProductDetail> details, ZoneId zone) {
if (details == null || details.isEmpty()) {
return java.util.Collections.emptyList();
}
List<InboundOrderLine> lines = new ArrayList<InboundOrderLine>(details.size());
for (YqnDtos.InboundPlanInfo.PlanProductDetail detail : details) {
for (YqnInboundPlanDtos.InboundPlanInfo.PlanProductDetail detail : details) {
if (detail.sku == null || detail.sku.trim().isEmpty()) {
continue;
}

10
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnInventoryMapper.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnInventoryDtos;
import common.ecommerce.shared.support.Page;
import common.ecommerce.warehouse.model.InventoryQuery;
import common.ecommerce.warehouse.model.InventorySnapshot;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.Instant;
import java.time.ZoneId;
@ -61,7 +61,7 @@ public final class YqnInventoryMapper { @@ -61,7 +61,7 @@ public final class YqnInventoryMapper {
}
/** 一条库存记录 → 统一快照。 */
public static InventorySnapshot toSnapshot(YqnDtos.InventoryRow row, String fallbackWarehouseCode,
public static InventorySnapshot toSnapshot(YqnInventoryDtos.InventoryRow row, String fallbackWarehouseCode,
ZoneId zone) {
String warehouseCode = hasText(row.warehouseCode) ? row.warehouseCode.trim()
: fallbackWarehouseCode;
@ -93,13 +93,13 @@ public final class YqnInventoryMapper { @@ -93,13 +93,13 @@ public final class YqnInventoryMapper {
}
/** 解析一整页。 */
public static Page<InventorySnapshot> toPage(YqnDtos.InventoryPage page, String fallbackWarehouseCode,
public static Page<InventorySnapshot> toPage(YqnInventoryDtos.InventoryPage page, String fallbackWarehouseCode,
ZoneId zone, String requestedPage) {
if (page == null || page.data == null || page.data.content == null) {
return Page.empty();
}
List<InventorySnapshot> items = new ArrayList<InventorySnapshot>(page.data.content.size());
for (YqnDtos.InventoryRow row : page.data.content) {
for (YqnInventoryDtos.InventoryRow row : page.data.content) {
InventorySnapshot snapshot = toSnapshot(row, fallbackWarehouseCode, zone);
if (snapshot != null) {
items.add(snapshot);
@ -110,7 +110,7 @@ public final class YqnInventoryMapper { @@ -110,7 +110,7 @@ public final class YqnInventoryMapper {
}
/** 翻页:以仓返回的 {@code last} 为准;缺失时用页码与总页数比较。 */
private static String nextCursor(YqnDtos.InventoryPage page, String requestedPage) {
private static String nextCursor(YqnInventoryDtos.InventoryPage page, String requestedPage) {
if (page.data.last != null && page.data.last) {
return null;
}

6
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnLogisticsProductMapper.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnLogisticsProductDtos;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.LogisticsProduct;
import common.ecommerce.yqn.dto.YqnDtos;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@ -46,12 +46,12 @@ public final class YqnLogisticsProductMapper { @@ -46,12 +46,12 @@ public final class YqnLogisticsProductMapper {
}
/** 响应 → 统一模型。 */
public static List<LogisticsProduct> toProducts(List<YqnDtos.CarrierGroup> rows, String warehouseCode) {
public static List<LogisticsProduct> toProducts(List<YqnLogisticsProductDtos.CarrierGroup> rows, String warehouseCode) {
if (rows == null || rows.isEmpty()) {
return new ArrayList<LogisticsProduct>();
}
List<LogisticsProduct> out = new ArrayList<LogisticsProduct>(rows.size());
for (YqnDtos.CarrierGroup row : rows) {
for (YqnLogisticsProductDtos.CarrierGroup row : rows) {
out.add(LogisticsProduct.builder()
.sourceProvider(WarehouseProvider.YQN)
.warehouseCode(warehouseCode)

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

@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnCreateOrderDtos;
import common.ecommerce.yqn.dto.YqnOrderDetailDtos;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.enums.CancelEligibility;
import common.ecommerce.warehouse.enums.LabelMode;
@ -12,7 +14,6 @@ import common.ecommerce.warehouse.model.PackageResult; @@ -12,7 +14,6 @@ import common.ecommerce.warehouse.model.PackageResult;
import common.ecommerce.warehouse.model.ShipTo;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.Instant;
import java.time.ZoneId;
@ -27,7 +28,7 @@ import java.util.Map; @@ -27,7 +28,7 @@ import java.util.Map;
/**
* 运去哪报文 → 统一模型。
*
* <p><b>平台字段名只出现在本类与 {@link YqnDtos}</b>;门面与领域模型不感知运去哪。
* <p><b>平台字段名只出现在本类与 {@code Yqn*Dtos}(按接口拆分)</b>;门面与领域模型不感知运去哪。
* 字段语义待打样核对(Spec §8.6),核对后只改这里。</p>
*/
public final class YqnOutboundMapper {
@ -48,8 +49,8 @@ public final class YqnOutboundMapper { @@ -48,8 +49,8 @@ public final class YqnOutboundMapper {
}
/** 统一命令 → 运去哪创建销售订单请求(API 123)。 */
public static YqnDtos.CreateOrderRequest toRequest(OutboundCommand cmd, String warehouseCode) {
YqnDtos.CreateOrderRequest req = new YqnDtos.CreateOrderRequest();
public static YqnCreateOrderDtos.CreateOrderRequest toRequest(OutboundCommand cmd, String warehouseCode) {
YqnCreateOrderDtos.CreateOrderRequest req = new YqnCreateOrderDtos.CreateOrderRequest();
req.orderNo = cmd.outboundRequestNo();
req.poNumber = cmd.orderRef();
req.warehouseCode = warehouseCode;
@ -119,11 +120,11 @@ public final class YqnOutboundMapper { @@ -119,11 +120,11 @@ public final class YqnOutboundMapper {
}
}
private static List<YqnDtos.CreateOrderRequest.ProductItem> toProductItems(List<OutboundLine> lines) {
List<YqnDtos.CreateOrderRequest.ProductItem> items =
new ArrayList<YqnDtos.CreateOrderRequest.ProductItem>(lines.size());
private static List<YqnCreateOrderDtos.CreateOrderRequest.ProductItem> toProductItems(List<OutboundLine> lines) {
List<YqnCreateOrderDtos.CreateOrderRequest.ProductItem> items =
new ArrayList<YqnCreateOrderDtos.CreateOrderRequest.ProductItem>(lines.size());
for (OutboundLine line : lines) {
YqnDtos.CreateOrderRequest.ProductItem item = new YqnDtos.CreateOrderRequest.ProductItem();
YqnCreateOrderDtos.CreateOrderRequest.ProductItem item = new YqnCreateOrderDtos.CreateOrderRequest.ProductItem();
item.sku = line.providerSku() != null ? line.providerSku() : line.omsSku();
item.quantity = line.quantity();
item.lineNo = line.lineNo();
@ -136,15 +137,15 @@ public final class YqnOutboundMapper { @@ -136,15 +137,15 @@ public final class YqnOutboundMapper {
return items;
}
private static List<YqnDtos.CreateOrderRequest.PackageItem> toPackageItems(
private static List<YqnCreateOrderDtos.CreateOrderRequest.PackageItem> toPackageItems(
List<OutboundPackageSpec> packages) {
if (packages == null || packages.isEmpty()) {
return null;
}
List<YqnDtos.CreateOrderRequest.PackageItem> out =
new ArrayList<YqnDtos.CreateOrderRequest.PackageItem>(packages.size());
List<YqnCreateOrderDtos.CreateOrderRequest.PackageItem> out =
new ArrayList<YqnCreateOrderDtos.CreateOrderRequest.PackageItem>(packages.size());
for (OutboundPackageSpec spec : packages) {
YqnDtos.CreateOrderRequest.PackageItem item = new YqnDtos.CreateOrderRequest.PackageItem();
YqnCreateOrderDtos.CreateOrderRequest.PackageItem item = new YqnCreateOrderDtos.CreateOrderRequest.PackageItem();
item.refNo = spec.refNo();
item.length = spec.lengthCm();
item.width = spec.widthCm();
@ -154,11 +155,11 @@ public final class YqnOutboundMapper { @@ -154,11 +155,11 @@ public final class YqnOutboundMapper {
item.materialType = new ArrayList<Integer>(spec.materialTypes());
}
if (!spec.skuInfos().isEmpty()) {
List<YqnDtos.CreateOrderRequest.PackageSku> skus =
new ArrayList<YqnDtos.CreateOrderRequest.PackageSku>(spec.skuInfos().size());
List<YqnCreateOrderDtos.CreateOrderRequest.PackageSku> skus =
new ArrayList<YqnCreateOrderDtos.CreateOrderRequest.PackageSku>(spec.skuInfos().size());
for (OutboundPackageSpec.SkuInfo sku : spec.skuInfos()) {
YqnDtos.CreateOrderRequest.PackageSku one =
new YqnDtos.CreateOrderRequest.PackageSku();
YqnCreateOrderDtos.CreateOrderRequest.PackageSku one =
new YqnCreateOrderDtos.CreateOrderRequest.PackageSku();
one.sku = sku.sku();
one.qty = sku.qty();
skus.add(one);
@ -184,7 +185,7 @@ public final class YqnOutboundMapper { @@ -184,7 +185,7 @@ public final class YqnOutboundMapper {
*
* <p>仓自有面单({@link LabelMode#WAREHOUSE_LABEL})或未给内容时返回 null。</p>
*/
private static List<YqnDtos.CreateOrderRequest.AttachInfoItem> toAttachInfoItems(
private static List<YqnCreateOrderDtos.CreateOrderRequest.AttachInfoItem> toAttachInfoItems(
OutboundCommand cmd, String warehouseCode) {
String content = cmd.labelContentBase64();
if (content == null || content.trim().isEmpty()) {
@ -196,8 +197,8 @@ public final class YqnOutboundMapper { @@ -196,8 +197,8 @@ public final class YqnOutboundMapper {
"labelContentBase64 requires labelMode=PLATFORM_LABEL for "
+ cmd.outboundRequestNo() + " (warehouse " + warehouseCode + ")");
}
YqnDtos.CreateOrderRequest.AttachInfoItem item =
new YqnDtos.CreateOrderRequest.AttachInfoItem();
YqnCreateOrderDtos.CreateOrderRequest.AttachInfoItem item =
new YqnCreateOrderDtos.CreateOrderRequest.AttachInfoItem();
// 附件名建议用 TrackingNo 且不带后缀;没有运单号时退回出库单号
item.name = firstNonBlank(cmd.trackingNumber(), cmd.outboundRequestNo());
String base64 = stripDataUri(content);
@ -209,8 +210,8 @@ public final class YqnOutboundMapper { @@ -209,8 +210,8 @@ public final class YqnOutboundMapper {
if (packages != null && packages.size() == 1) {
item.packageNo = packages.get(0).refNo();
}
List<YqnDtos.CreateOrderRequest.AttachInfoItem> out =
new ArrayList<YqnDtos.CreateOrderRequest.AttachInfoItem>(1);
List<YqnCreateOrderDtos.CreateOrderRequest.AttachInfoItem> out =
new ArrayList<YqnCreateOrderDtos.CreateOrderRequest.AttachInfoItem>(1);
out.add(item);
return out;
}
@ -248,7 +249,7 @@ public final class YqnOutboundMapper { @@ -248,7 +249,7 @@ public final class YqnOutboundMapper {
}
/** 订单详情 → 统一出库单(API 128)。 */
public static OutboundOrder toOrder(YqnDtos.OrderDetail detail, String warehouseCode, ZoneId zone) {
public static OutboundOrder toOrder(YqnOrderDetailDtos.OrderDetail detail, String warehouseCode, ZoneId zone) {
return toOrder(detail, null, null, warehouseCode, zone);
}
@ -259,9 +260,9 @@ public final class YqnOutboundMapper { @@ -259,9 +260,9 @@ public final class YqnOutboundMapper {
* 只能由调用方带过来(null 时按仓自有面单兜底)
* @param requestedAt 下单时间;API 128 不回传,同样由调用方带过来
*/
public static OutboundOrder toOrder(YqnDtos.OrderDetail detail, LabelMode requestedLabelMode,
public static OutboundOrder toOrder(YqnOrderDetailDtos.OrderDetail detail, LabelMode requestedLabelMode,
Instant requestedAt, String warehouseCode, ZoneId zone) {
List<YqnDtos.OrderDetail.ShipmentPackage> shippedPackages = shippedPackagesOf(detail);
List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> shippedPackages = shippedPackagesOf(detail);
OutboundOrder.Builder builder = OutboundOrder.builder()
.warehouseCode(firstNonBlank(detail.warehouseCode, warehouseCode))
.outboundRequestNo(firstNonBlank(detail.orderNo, null))
@ -291,19 +292,19 @@ public final class YqnOutboundMapper { @@ -291,19 +292,19 @@ public final class YqnOutboundMapper {
* 同一个 trackingNo 可能与实际包裹重复出现;按 trackingNo 去重,
* 面单行没有 trackingNo 时跳过,避免虚增包裹数。</p>
*/
public static List<PackageResult> toPackages(YqnDtos.OrderDetail detail) {
public static List<PackageResult> toPackages(YqnOrderDetailDtos.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) {
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : detail.shipmentPackages) {
if (isActualPackage(pkg)) {
putPackage(byKey, pkg, detail.orderNo);
}
}
for (YqnDtos.OrderDetail.ShipmentPackage pkg : detail.shipmentPackages) {
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : detail.shipmentPackages) {
if (!isActualPackage(pkg)) {
putPackage(byKey, pkg, detail.orderNo);
}
@ -312,7 +313,7 @@ public final class YqnOutboundMapper { @@ -312,7 +313,7 @@ public final class YqnOutboundMapper {
}
private static void putPackage(Map<String, PackageResult> byKey,
YqnDtos.OrderDetail.ShipmentPackage pkg, String orderNo) {
YqnOrderDetailDtos.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)) {
@ -332,18 +333,18 @@ public final class YqnOutboundMapper { @@ -332,18 +333,18 @@ public final class YqnOutboundMapper {
}
/** 是否实际包裹(packageFlag=0 或缺失)。 */
private static boolean isActualPackage(YqnDtos.OrderDetail.ShipmentPackage pkg) {
private static boolean isActualPackage(YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg) {
return pkg.packageFlag == null || pkg.packageFlag == 0;
}
/** 实际包裹优先;只用于取顶层承运商与跟踪号。 */
static List<YqnDtos.OrderDetail.ShipmentPackage> shippedPackagesOf(YqnDtos.OrderDetail detail) {
static List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> shippedPackagesOf(YqnOrderDetailDtos.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) {
List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> actual =
new ArrayList<YqnOrderDetailDtos.OrderDetail.ShipmentPackage>();
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : detail.shipmentPackages) {
if (isActualPackage(pkg)) {
actual.add(pkg);
}
@ -351,9 +352,9 @@ public final class YqnOutboundMapper { @@ -351,9 +352,9 @@ public final class YqnOutboundMapper {
return actual.isEmpty() ? detail.shipmentPackages : actual;
}
private static String packagesCarrierOf(List<YqnDtos.OrderDetail.ShipmentPackage> packages,
private static String packagesCarrierOf(List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> packages,
String fallbackCarrierCode) {
for (YqnDtos.OrderDetail.ShipmentPackage pkg : packages) {
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : packages) {
if (hasText(pkg.carrier)) {
return pkg.carrier;
}
@ -361,8 +362,8 @@ public final class YqnOutboundMapper { @@ -361,8 +362,8 @@ public final class YqnOutboundMapper {
return fallbackCarrierCode;
}
private static String firstTrackingOf(List<YqnDtos.OrderDetail.ShipmentPackage> packages) {
for (YqnDtos.OrderDetail.ShipmentPackage pkg : packages) {
private static String firstTrackingOf(List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> packages) {
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : packages) {
if (hasText(pkg.trackingNo)) {
return pkg.trackingNo;
}
@ -370,8 +371,8 @@ public final class YqnOutboundMapper { @@ -370,8 +371,8 @@ public final class YqnOutboundMapper {
return null;
}
private static Instant firstShipmentTime(List<YqnDtos.OrderDetail.ShipmentPackage> packages, ZoneId zone) {
for (YqnDtos.OrderDetail.ShipmentPackage pkg : packages) {
private static Instant firstShipmentTime(List<YqnOrderDetailDtos.OrderDetail.ShipmentPackage> packages, ZoneId zone) {
for (YqnOrderDetailDtos.OrderDetail.ShipmentPackage pkg : packages) {
Instant time = parseTime(pkg.shipmentDate, zone);
if (time != null) {
return time;
@ -380,12 +381,12 @@ public final class YqnOutboundMapper { @@ -380,12 +381,12 @@ public final class YqnOutboundMapper {
return null;
}
private static List<OutboundLine> toLines(List<YqnDtos.OrderDetail.DetailProductItem> items) {
private static List<OutboundLine> toLines(List<YqnOrderDetailDtos.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) {
for (YqnOrderDetailDtos.OrderDetail.DetailProductItem item : items) {
if (!hasText(item.sku)) {
continue;
}
@ -400,7 +401,7 @@ public final class YqnOutboundMapper { @@ -400,7 +401,7 @@ public final class YqnOutboundMapper {
}
/** 详情里没有任何地址字段时返回 null,避免把「空地址」当成真实地址回传给业务。 */
private static ShipTo toShipTo(YqnDtos.OrderDetail detail) {
private static ShipTo toShipTo(YqnOrderDetailDtos.OrderDetail detail) {
if (!hasText(detail.shipToCountry) && !hasText(detail.shipToAddress1)
&& !hasText(detail.shipToCity) && !hasText(detail.shipToContact)) {
return null;

16
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnProductMapper.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnProductDtos;
import common.ecommerce.shared.support.Money;
import common.ecommerce.warehouse.capability.WarehouseProduct;
import common.ecommerce.yqn.enums.YqnReturnDealMethod;
import common.ecommerce.yqn.dto.YqnDtos;
import java.util.ArrayList;
import java.util.List;
@ -12,7 +12,7 @@ import java.util.Locale; @@ -12,7 +12,7 @@ import java.util.Locale;
/**
* 运去哪商品报文映射(API 115 / {@code /v1/product/save})。
*
* <p>平台字段名只出现在本类与 {@link YqnDtos}。</p>
* <p>平台字段名只出现在本类与 {@code Yqn*Dtos}(按接口拆分)。</p>
*/
public final class YqnProductMapper {
@ -28,8 +28,8 @@ public final class YqnProductMapper { @@ -28,8 +28,8 @@ public final class YqnProductMapper {
* <p>运去哪必填的长宽高与重量在 {@link WarehouseProduct} 构造期已校验,
* 这里只做字段搬运与单位对齐(cm / g 与平台一致,不换算)。</p>
*/
public static YqnDtos.SaveProductRequest toRequest(WarehouseProduct product) {
YqnDtos.SaveProductRequest req = new YqnDtos.SaveProductRequest();
public static YqnProductDtos.SaveProductRequest toRequest(WarehouseProduct product) {
YqnProductDtos.SaveProductRequest req = new YqnProductDtos.SaveProductRequest();
req.sku = skuOf(product);
req.customItemNo = product.customItemNo();
req.upc = product.barcode();
@ -77,12 +77,12 @@ public final class YqnProductMapper { @@ -77,12 +77,12 @@ public final class YqnProductMapper {
* <p>三项没有整组给时返回 null(不发 customs),
* {@link WarehouseProduct} 已在构造期挡掉「只给一半」的情况。</p>
*/
static List<YqnDtos.SaveProductRequest.Customs> toCustoms(Money declaredValue,
static List<YqnProductDtos.SaveProductRequest.Customs> toCustoms(Money declaredValue,
String hsCode, String countryCode) {
if (declaredValue == null || isBlank(hsCode) || isBlank(countryCode)) {
return null;
}
YqnDtos.SaveProductRequest.Customs customs = new YqnDtos.SaveProductRequest.Customs();
YqnProductDtos.SaveProductRequest.Customs customs = new YqnProductDtos.SaveProductRequest.Customs();
customs.countryCode = countryCode.trim().toUpperCase(Locale.ROOT);
customs.customCode = hsCode.trim();
customs.importDeclaredValue = declaredValue.amount().doubleValue();
@ -90,8 +90,8 @@ public final class YqnProductMapper { @@ -90,8 +90,8 @@ public final class YqnProductMapper {
customs.exportDeclaredValue = declaredValue.amount().doubleValue();
customs.exportDeclaredCurrency = CUSTOMS_CURRENCY;
List<YqnDtos.SaveProductRequest.Customs> out =
new ArrayList<YqnDtos.SaveProductRequest.Customs>(1);
List<YqnProductDtos.SaveProductRequest.Customs> out =
new ArrayList<YqnProductDtos.SaveProductRequest.Customs>(1);
out.add(customs);
return out;
}

21
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java

@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnCreateSaleReturnDtos;
import common.ecommerce.yqn.dto.YqnReturnProcessDtos;
import common.ecommerce.warehouse.model.ReturnCommand;
import common.ecommerce.warehouse.model.ReturnProcessCommand;
import common.ecommerce.warehouse.model.WarehouseReturn;
import common.ecommerce.yqn.enums.YqnReturnDealMethod;
import common.ecommerce.warehouse.enums.ReturnProcessDisposition;
import common.ecommerce.yqn.enums.YqnReturnProcessDisposition;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@ -24,8 +25,8 @@ public final class YqnReturnMapper { @@ -24,8 +25,8 @@ public final class YqnReturnMapper {
}
/** 统一命令 → 创建销售退货请求。 */
public static YqnDtos.CreateSaleReturnRequest toRequest(ReturnCommand cmd, String warehouseCode) {
YqnDtos.CreateSaleReturnRequest req = new YqnDtos.CreateSaleReturnRequest();
public static YqnCreateSaleReturnDtos.CreateSaleReturnRequest toRequest(ReturnCommand cmd, String warehouseCode) {
YqnCreateSaleReturnDtos.CreateSaleReturnRequest req = new YqnCreateSaleReturnDtos.CreateSaleReturnRequest();
req.warehouseCode = warehouseCode;
req.orderNo = cmd.returnRequestNo();
req.saleOrderNo = cmd.saleOrderNo();
@ -38,13 +39,13 @@ public final class YqnReturnMapper { @@ -38,13 +39,13 @@ public final class YqnReturnMapper {
return req;
}
private static List<YqnDtos.CreateSaleReturnRequest.SaleReturnItem> toItems(
private static List<YqnCreateSaleReturnDtos.CreateSaleReturnRequest.SaleReturnItem> toItems(
List<ReturnCommand.ReturnCommandLine> lines) {
List<YqnDtos.CreateSaleReturnRequest.SaleReturnItem> items =
new ArrayList<YqnDtos.CreateSaleReturnRequest.SaleReturnItem>(lines.size());
List<YqnCreateSaleReturnDtos.CreateSaleReturnRequest.SaleReturnItem> items =
new ArrayList<YqnCreateSaleReturnDtos.CreateSaleReturnRequest.SaleReturnItem>(lines.size());
for (ReturnCommand.ReturnCommandLine line : lines) {
YqnDtos.CreateSaleReturnRequest.SaleReturnItem item =
new YqnDtos.CreateSaleReturnRequest.SaleReturnItem();
YqnCreateSaleReturnDtos.CreateSaleReturnRequest.SaleReturnItem item =
new YqnCreateSaleReturnDtos.CreateSaleReturnRequest.SaleReturnItem();
item.sku = line.providerSku();
// 运去哪这个字段是 string;数量原样传字符串,不做格式化
item.qty = String.valueOf(line.quantity());
@ -55,8 +56,8 @@ public final class YqnReturnMapper { @@ -55,8 +56,8 @@ public final class YqnReturnMapper {
}
/** 统一命令 → 退货条目处理请求。 */
public static YqnDtos.SaleReturnProcessRequest toProcessRequest(ReturnProcessCommand cmd) {
YqnDtos.SaleReturnProcessRequest req = new YqnDtos.SaleReturnProcessRequest();
public static YqnReturnProcessDtos.SaleReturnProcessRequest toProcessRequest(ReturnProcessCommand cmd) {
YqnReturnProcessDtos.SaleReturnProcessRequest req = new YqnReturnProcessDtos.SaleReturnProcessRequest();
req.saleReturnPlanNo = cmd.providerReturnNo();
req.id = cmd.lineId();
req.goodsReturnType = YqnReturnProcessDisposition.codeOf(cmd.disposition());

9
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnSkuLabelMapper.java

@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnBoxLabelDtos;
import common.ecommerce.yqn.dto.YqnSkuLabelDtos;
import common.ecommerce.warehouse.enums.LabelDownloadMode;
import common.ecommerce.warehouse.enums.SkuLabelSizeType;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.LabelPrintTask;
import common.ecommerce.warehouse.model.SkuLabelCommand;
import common.ecommerce.yqn.dto.YqnDtos;
/**
* 运去哪入库 SKU 标报文映射(API 100)。
@ -16,8 +17,8 @@ public final class YqnSkuLabelMapper { @@ -16,8 +17,8 @@ public final class YqnSkuLabelMapper {
}
/** 统一命令 → 运去哪请求。 */
public static YqnDtos.SkuLabelRequest toRequest(SkuLabelCommand cmd) {
YqnDtos.SkuLabelRequest req = new YqnDtos.SkuLabelRequest();
public static YqnSkuLabelDtos.SkuLabelRequest toRequest(SkuLabelCommand cmd) {
YqnSkuLabelDtos.SkuLabelRequest req = new YqnSkuLabelDtos.SkuLabelRequest();
req.orderNo = cmd.providerInboundNo();
req.sourceNo = cmd.inboundRequestNo();
req.downloadMode = downloadModeCode(cmd.downloadMode());
@ -31,7 +32,7 @@ public final class YqnSkuLabelMapper { @@ -31,7 +32,7 @@ public final class YqnSkuLabelMapper {
}
/** 响应 → 任务。异步接口只回任务编号,不带文件。 */
public static LabelPrintTask toTask(YqnDtos.BoxLabelResponse resp, SkuLabelCommand cmd) {
public static LabelPrintTask toTask(YqnBoxLabelDtos.BoxLabelResponse resp, SkuLabelCommand cmd) {
return LabelPrintTask.builder()
.sourceProvider(WarehouseProvider.YQN)
.taskNo(resp.taskNo)

16
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnTrackingMapper.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnTrackingDtos;
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;
@ -31,10 +31,10 @@ public final class YqnTrackingMapper { @@ -31,10 +31,10 @@ public final class YqnTrackingMapper {
}
/** 响应 → 运单级轨迹。 */
public static TrackingInfo toTrackingInfo(YqnDtos.ShipmentTrack track, String requestedTrackingNo,
public static TrackingInfo toTrackingInfo(YqnTrackingDtos.ShipmentTrack track, String requestedTrackingNo,
ZoneId zone) {
String trackingNo = hasText(track.trackingCode) ? track.trackingCode.trim() : requestedTrackingNo;
YqnDtos.ShipmentTrack.CarrierDetail carrierDetail = track.carrierDetail;
YqnTrackingDtos.ShipmentTrack.CarrierDetail carrierDetail = track.carrierDetail;
TrackingInfo.Builder builder = TrackingInfo.builder()
.trackingNumber(trackingNo)
.carrier(track.carrier)
@ -45,9 +45,9 @@ public final class YqnTrackingMapper { @@ -45,9 +45,9 @@ public final class YqnTrackingMapper {
.signedBy(track.signedBy)
.publicUrl(track.publicUrl);
List<YqnDtos.ShipmentTrack.TrackDetail> details = track.trackingDetails;
List<YqnTrackingDtos.ShipmentTrack.TrackDetail> details = track.trackingDetails;
if (details != null) {
for (YqnDtos.ShipmentTrack.TrackDetail detail : details) {
for (YqnTrackingDtos.ShipmentTrack.TrackDetail detail : details) {
builder.event(toTrackEvent(detail, trackingNo, track.carrier, zone));
}
}
@ -55,12 +55,12 @@ public final class YqnTrackingMapper { @@ -55,12 +55,12 @@ public final class YqnTrackingMapper {
}
/** 只取节点明细。 */
public static List<TrackEvent> toTrackEvents(YqnDtos.ShipmentTrack track, String requestedTrackingNo,
public static List<TrackEvent> toTrackEvents(YqnTrackingDtos.ShipmentTrack track, String requestedTrackingNo,
ZoneId zone) {
return toTrackingInfo(track, requestedTrackingNo, zone).events();
}
private static TrackEvent toTrackEvent(YqnDtos.ShipmentTrack.TrackDetail detail, String trackingNo,
private static TrackEvent toTrackEvent(YqnTrackingDtos.ShipmentTrack.TrackDetail detail, String trackingNo,
String carrier, ZoneId zone) {
return TrackEvent.builder()
.trackingNumber(trackingNo)
@ -73,7 +73,7 @@ public final class YqnTrackingMapper { @@ -73,7 +73,7 @@ public final class YqnTrackingMapper {
}
/** 位置拼成一行,如 {@code New York, NY, US, 10001};全空返回 null。 */
private static String locationOf(YqnDtos.ShipmentTrack.TrackingLocation loc) {
private static String locationOf(YqnTrackingDtos.ShipmentTrack.TrackingLocation loc) {
if (loc == null) {
return null;
}

37
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnTransferMapper.java

@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnCreateInboundDtos;
import common.ecommerce.yqn.dto.YqnTransferDtos;
import common.ecommerce.warehouse.model.InboundBatch;
import common.ecommerce.warehouse.model.ShipTo;
import common.ecommerce.warehouse.model.TransferCommand;
@ -7,7 +9,6 @@ import common.ecommerce.warehouse.model.TransferOrder; @@ -7,7 +9,6 @@ import common.ecommerce.warehouse.model.TransferOrder;
import common.ecommerce.warehouse.enums.TransferType;
import common.ecommerce.yqn.enums.YqnTransferStatus;
import common.ecommerce.yqn.enums.YqnTransferType;
import common.ecommerce.yqn.dto.YqnDtos;
import java.time.Instant;
import java.time.LocalDate;
@ -29,8 +30,8 @@ public final class YqnTransferMapper { @@ -29,8 +30,8 @@ public final class YqnTransferMapper {
}
/** 统一命令 → 运去哪创建调拨单请求。 */
public static YqnDtos.CreateTransferPlanRequest toRequest(TransferCommand cmd) {
YqnDtos.CreateTransferPlanRequest req = new YqnDtos.CreateTransferPlanRequest();
public static YqnTransferDtos.CreateTransferPlanRequest toRequest(TransferCommand cmd) {
YqnTransferDtos.CreateTransferPlanRequest req = new YqnTransferDtos.CreateTransferPlanRequest();
req.type = YqnTransferType.codeOf(cmd.type());
req.orgWarehouseCode = cmd.fromWarehouseCode();
req.inOrgWarehouseCode = cmd.toWarehouseCode();
@ -69,13 +70,13 @@ public final class YqnTransferMapper { @@ -69,13 +70,13 @@ public final class YqnTransferMapper {
return req;
}
private static List<YqnDtos.CreateTransferPlanRequest.TransferItem> toItems(
private static List<YqnTransferDtos.CreateTransferPlanRequest.TransferItem> toItems(
List<TransferCommand.TransferLine> lines) {
List<YqnDtos.CreateTransferPlanRequest.TransferItem> items =
new ArrayList<YqnDtos.CreateTransferPlanRequest.TransferItem>(lines.size());
List<YqnTransferDtos.CreateTransferPlanRequest.TransferItem> items =
new ArrayList<YqnTransferDtos.CreateTransferPlanRequest.TransferItem>(lines.size());
for (TransferCommand.TransferLine line : lines) {
YqnDtos.CreateTransferPlanRequest.TransferItem item =
new YqnDtos.CreateTransferPlanRequest.TransferItem();
YqnTransferDtos.CreateTransferPlanRequest.TransferItem item =
new YqnTransferDtos.CreateTransferPlanRequest.TransferItem();
item.sku = line.providerSku();
item.qty = line.quantity();
items.add(item);
@ -83,23 +84,23 @@ public final class YqnTransferMapper { @@ -83,23 +84,23 @@ public final class YqnTransferMapper {
return items;
}
private static List<YqnDtos.CreateTransferPlanRequest.TransferBatchItem> toBatchItems(
private static List<YqnTransferDtos.CreateTransferPlanRequest.TransferBatchItem> toBatchItems(
List<InboundBatch> batches) {
if (batches == null || batches.isEmpty()) {
return null;
}
List<YqnDtos.CreateTransferPlanRequest.TransferBatchItem> items =
new ArrayList<YqnDtos.CreateTransferPlanRequest.TransferBatchItem>(batches.size());
List<YqnTransferDtos.CreateTransferPlanRequest.TransferBatchItem> items =
new ArrayList<YqnTransferDtos.CreateTransferPlanRequest.TransferBatchItem>(batches.size());
for (InboundBatch batch : batches) {
YqnDtos.CreateTransferPlanRequest.TransferBatchItem item =
new YqnDtos.CreateTransferPlanRequest.TransferBatchItem();
YqnTransferDtos.CreateTransferPlanRequest.TransferBatchItem item =
new YqnTransferDtos.CreateTransferPlanRequest.TransferBatchItem();
item.sku = batch.providerSku();
item.qty = batch.quantity();
List<YqnDtos.CreateInboundPlanRequest.BatchAttr> params =
new ArrayList<YqnDtos.CreateInboundPlanRequest.BatchAttr>(batch.params().size());
List<YqnTransferDtos.CreateTransferPlanRequest.BatchAttr> params =
new ArrayList<YqnTransferDtos.CreateTransferPlanRequest.BatchAttr>(batch.params().size());
for (InboundBatch.BatchParam param : batch.params()) {
YqnDtos.CreateInboundPlanRequest.BatchAttr attr =
new YqnDtos.CreateInboundPlanRequest.BatchAttr();
YqnTransferDtos.CreateTransferPlanRequest.BatchAttr attr =
new YqnTransferDtos.CreateTransferPlanRequest.BatchAttr();
attr.batchAttriKey = param.key();
attr.batchAttriValue = param.value();
params.add(attr);
@ -116,7 +117,7 @@ public final class YqnTransferMapper { @@ -116,7 +117,7 @@ public final class YqnTransferMapper {
* <p>响应里没有回传 {@code type}(0/1/2/3),所以类型从请求侧带过来,
* 不从响应猜。</p>
*/
public static TransferOrder toOrder(YqnDtos.CreateTransferPlanResponse resp,
public static TransferOrder toOrder(YqnTransferDtos.CreateTransferPlanResponse resp,
TransferType requestedType, String requestedSourceNo,
ZoneId zone) {
return TransferOrder.builder()

6
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnWarehouseMapper.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.yqn.adapter;
import common.ecommerce.yqn.dto.YqnWarehouseDtos;
import common.ecommerce.warehouse.enums.WarehouseProvider;
import common.ecommerce.warehouse.model.WarehouseInfo;
import common.ecommerce.yqn.dto.YqnDtos;
import java.util.ArrayList;
import java.util.List;
@ -16,12 +16,12 @@ public final class YqnWarehouseMapper { @@ -16,12 +16,12 @@ public final class YqnWarehouseMapper {
}
/** 响应 → 统一仓库档案。 */
public static List<WarehouseInfo> toWarehouses(List<YqnDtos.WarehouseRow> rows) {
public static List<WarehouseInfo> toWarehouses(List<YqnWarehouseDtos.WarehouseRow> rows) {
if (rows == null || rows.isEmpty()) {
return new ArrayList<WarehouseInfo>();
}
List<WarehouseInfo> out = new ArrayList<WarehouseInfo>(rows.size());
for (YqnDtos.WarehouseRow row : rows) {
for (YqnWarehouseDtos.WarehouseRow row : rows) {
out.add(WarehouseInfo.builder()
.sourceProvider(WarehouseProvider.YQN)
.warehouseCode(row.warehouseCode)

44
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnBoxLabelDtos.java

@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:打印入库计划单箱标(API 99,/v1/inbound/generateBoxLabel)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnBoxLabelDtos {
private YqnBoxLabelDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class BoxLabelRequest {
/** 入库计划单号(仓侧 ip 单号)。 */
public String orderNo;
/** 来源单号(OMS 推单时的外部单号)。 */
public String sourceNo;
/** 1 合成压缩包 / 2 合成一个 pdf。 */
public Integer downloadMode;
/** 1 100*100 / 2 100*150 / 3 104*98(美国信纸)。 */
public Integer labelSizeType;
/** 每页打印数量 1 / 6。 */
public Integer numPerPage;
/** 是否一式两份。 */
public Boolean twoCopies;
/** 是否展示客户唯一标识符。 */
public Boolean showOrgUniqueCode;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class BoxLabelResponse {
/** 任务编号;文件生成后靠它去任务中心查下载地址。 */
public String taskNo;
public String orderNo;
public String sourceNo;
}
}

27
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCancelOrderDtos.java

@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:取消销售订单(API 122,/v1/saleOrder/cancel)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnCancelOrderDtos {
private YqnCancelOrderDtos() {
}
/**
* 取消销售订单请求(API 122):只有 {@code orderNo}。
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CancelOrderRequest {
/** 订单号,即下单时的来源单号。 */
public String orderNo;
}
}

141
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateInboundDtos.java

@ -0,0 +1,141 @@ @@ -0,0 +1,141 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:创建入库计划单(API 97,/v1/inbound/createInboundPlan)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnCreateInboundDtos {
private YqnCreateInboundDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateInboundPlanRequest {
/** 入库仓库 CODE,必填。 */
public String warehouseCode;
/** 项目名称。 */
public String lineCode;
/** 0 正常库存 / 1 不可售库存,必填。 */
public Integer inventoryType;
/** 工厂批次号。 */
public String batchNumber;
/** 入库单号(外部来源单号),必填。 */
public String orderNo;
/** Amazon 订单 ShipmentId。 */
public String shipmentId;
/** Amazon 订单 referenceId。 */
public String referenceId;
/** 单据币种,默认 USD;影响库存成本计算。 */
public String currency;
/** 预计到仓 yyyy-MM-dd。 */
public String estimateArriveTime;
public String originCountry;
/** 期望到仓 yyyy-MM-dd。 */
public String expectArriveDate;
/** 预计发运 yyyy-MM-dd。 */
public String predictionShipDate;
public String shipperName;
public String shipperAddress;
public String shipperContact;
public String shipperPhone;
/** 集装箱号:4 位大写字母 + 7 位数字。 */
public String containerNo;
public String remark;
/** 产品明细,必填。 */
public List<InboundProductItem> productItems;
/** 附件。 */
public List<InboundAttachItem> attachInfoItems;
/** 装箱信息。 */
public List<InboundCartonItem> cartonItems;
/** 批次明细。 */
public List<InboundBatchItem> batchItems;
/** 头程类型 0 自发 / 1 运去哪头程(openapi 只支持 0)。 */
public Integer logisticsType;
/** 国际运输方式 0 海运整柜 / 1 海运散货 / 2 国际快递 / 3 空运。 */
public Integer transportType;
/** 送仓方式 1 集装箱 / 2 卡车 / 3 快递。 */
public Integer deliveryType;
/** 集装箱尺寸 0 无 / 1 GP20 / 2 GP40 / 3 HQ40 / 4 HQ45。 */
public Integer goodsSize;
/** 物流单号集合,逗号分割。 */
public String tmsNos;
/** 承运商 0 FEDEX / 1 USPS / 2 UPS / 3 DHL / 4 OTHER。 */
public Integer carrier;
/** 是否 SOC 箱 0 否 / 1 是。 */
public Integer socFlag;
/** 是否打托 0 否 / 1 是。 */
public Integer palletFlag;
/** 入库商品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InboundProductItem {
public String sku;
public Integer qty;
/** 采购成本,影响库存成本。 */
public Double cost;
}
/** 附件。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InboundAttachItem {
public String name;
/** 与 file 至少给一个。 */
public String url;
/** base64;给了就忽略 url。 */
public String file;
/** ShippingLabel / PackingList / BOL / Other。 */
public String type;
public String remark;
}
/** 装箱信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InboundCartonItem {
public String sku;
public Integer qty;
/** 装箱入数。 */
public Integer cartonQty;
/** 箱码,必填。 */
public String cartonNo;
/** 外箱重量(g)。 */
public Double cartonWeight;
/** 外箱尺寸(cm)。 */
public Double cartonLength;
public Double cartonWidth;
public Double cartonHeight;
/** 箱序标识;一箱多 SKU 时归并同一物理箱。 */
public String sid;
}
/** 批次明细。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InboundBatchItem {
public String sku;
/** 箱唛号;正式箱唛最少 7 位且末四位为数字。 */
public String cartonNo;
public Integer qty;
public List<BatchAttr> batchParam;
}
/** 批次属性键值。 */
public static final class BatchAttr {
public String batchAttriKey;
public String batchAttriValue;
}
}
/** 创建入库计划响应 {@code data}。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateInboundPlanResponse {
/** 入库计划单号。 */
public String inboundPlanOrderNo;
}
}

177
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateOrderDtos.java

@ -0,0 +1,177 @@ @@ -0,0 +1,177 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:创建销售订单(API 123,/v1/saleOrder/create)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnCreateOrderDtos {
private YqnCreateOrderDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateOrderRequest {
/** 来源单号;用 OMS 的出库单号,仓侧回查与幂等锚点。 */
public String orderNo;
/** 承运商,如 FedEx / UPS。 */
public String carrier;
/** 物流商服务 Code;不传走仓的分物流渠道规则。 */
public String carrierCode;
/** 仓 code;不传走分仓规则。 */
public String warehouseCode;
/** 币种,不填默认 USD。 */
public String currency;
/** 支付时间 {@code yyyy-MM-dd HH:mm:ss};不填默认当前时间。 */
public String paidAt;
/** 目的国家,2 位字符。必填。 */
public String shipToCountry;
/** 目的州;美加为 2 位编码。必填。 */
public String shipToState;
/** 目的城市。必填。 */
public String shipToCity;
/** 发运邮编。必填。 */
public String shipToPostal;
/** 发运地址1。必填。 */
public String shipToAddress1;
public String shipToAddress2;
public String shipToAddress3;
/** 发运联系人。必填。 */
public String shipToContact;
/** 发运联系电话。必填。 */
public String shipToTelephone;
/** 客户姓名。 */
public String buyerName;
/** 客户邮箱。 */
public String buyerEmail;
/** third party 账号。 */
public String thirdPartyAccount;
/** 发货时效:Standard-48 Hours / Same Day Ship Out / Outbound First Class;不填为标准。 */
public String shipServiceLevel;
/** 平台订单号。 */
public String poNumber;
/** Amazon 店铺 Seller ID。 */
public String sellerCode;
/** 店铺名称;传入时会校验系统内是否存在。 */
public String channelAccount;
/** 订单特殊标签 0 无 / 1 SFP / 2 VC;不填默认无。 */
public Integer isPrime;
/** 最晚发货时间 {@code yyyy-MM-dd HH:mm:ss}。 */
public String latestShipDate;
/** 最晚送达时间 {@code yyyy-MM-dd HH:mm:ss}。 */
public String estimatedDeliveryTime;
/** 销售平台类型,码值见 API 123;必填。 */
public Integer salesPlatform;
/** ERP 来源类型;领星为 1。 */
public Integer erpPlatform;
public String remark;
/** 产品行,必填。 */
public List<ProductItem> productItems;
/** 附件(面单 / 装箱单 / BOL 等);非必填,传了就要给全必填子字段。 */
public List<AttachInfoItem> attachInfoItems;
/** 发货包裹;不传则由仓按默认规则打包。 */
public List<PackageItem> packageItems;
/** 业务标签 100 售后卡 / 110 贴发票 / 20 不使用耗材 / 21 纸箱打包 / 22 快递袋打包 / 150 采集 SN。 */
public List<Integer> tags;
/** 产品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ProductItem {
/** 发货产品 SKU。 */
public String sku;
/** 父商品 ERP SKU;箱产品必填。 */
public String parentErpsku;
/** 批次属性,JSON 字符串。 */
public String batchItems;
/** 商品形态 0 单一产品 / 2 箱产品;箱产品必填。 */
public Integer saleType;
/** 标准件数;箱产品必填。 */
public Integer standardQuantity;
/** 发货数量。 */
public Integer quantity;
/** 是否保价 0 否 / 1 是;不填从产品中心取。 */
public Integer isInsure;
/** 签收类型 0 不签收 / 1 直接 / 2 成人 / 3 间接;不填从产品中心取。 */
public Integer isSignature;
/** 当前 SKU 总金额(美元)。 */
public Double skuAmount;
/** 投保金额;保价时必填。 */
public Double insureAmount;
/** 商品货号。 */
public String articleNo;
/** EAN 条码。 */
public String ean;
/** 供应商货号。 */
public String supplierArticleNo;
/** 行号,当前订单内唯一。 */
public String lineNo;
/** 产品订单序列号;各平台语义不同。 */
public String skuOrderSn;
/** 产品交易序列号;各平台语义不同。 */
public String skuTransactionSn;
/** 危险品标签。 */
public String dangerousLabel;
/** 危险品标签数量。 */
public Integer dangerousLabelQty;
}
/** 附件。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class AttachInfoItem {
/** 附件名称,建议用 TrackingNo 且不带后缀。 */
public String name;
/** 附件 URL;与 {@link #file} 至少给一个。 */
public String url;
/** base64 内容;给了就忽略 url。 */
public String file;
/** 0 面单 / 1 装箱单 / 2 BOL / 3 其他 / 4 箱标 / 5 托盘标 / 6 商品标 / 7 发票 / 8 发货计划。 */
public Integer type;
/** base64 时的格式:png / pdf,默认 pdf。 */
public String fileType;
public String remark;
/** 包裹号,与包裹的 refNo 一致。 */
public String packageNo;
}
/** 包裹。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class PackageItem {
public String refNo;
/** 长(cm),必填。 */
public Double length;
/** 宽(cm),必填。 */
public Double width;
/** 高(cm),必填。 */
public Double height;
/** 重量(g),必填。 */
public Double weight;
/** 包裹内 SKU;只有一个包裹时可省略,表示全部 SKU 同箱。 */
public List<PackageSku> skuInfos;
/** 打包耗材 20 / 21 / 22,必填。 */
public List<Integer> materialType;
}
/** 包裹内 SKU 数量。 */
public static final class PackageSku {
public String sku;
public Integer qty;
}
}
/** 创建销售订单响应的 {@code data}。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateOrderResponse {
/** 仓侧订单 id,列表查询时可用。 */
public Long orderId;
}
}

49
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnCreateSaleReturnDtos.java

@ -0,0 +1,49 @@ @@ -0,0 +1,49 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:创建销售退货(API 81,/v3/saleReturn/createSaleReturnPlan)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnCreateSaleReturnDtos {
private YqnCreateSaleReturnDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateSaleReturnRequest {
/** 仓库 code,必填。 */
public String warehouseCode;
/** 来源单号,必填。 */
public String orderNo;
public String lineName;
/** 关联销售订单号,必填。 */
public String saleOrderNo;
/** 退货运单号,必填。 */
public String returnTrackingNo;
/** 退货承运商,必填。 */
public String carrierCode;
/** 预计到仓日期 yyyy-MM-dd。 */
public String estimateReceiveDate;
public String returnReason;
public String remark;
/** 退货产品明细,必填。 */
public List<SaleReturnItem> productItemRequests;
/** 退货商品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class SaleReturnItem {
public String sku;
/** 数量;文档标为 string。 */
public String qty;
/** 0 客户自提 / 1 拍照确认 / 2 销毁 / 5 仓库确认。 */
public Integer returnDealMethod;
}
}
}

56
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDestroyPlanDtos.java

@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:创建销毁计划单(API 88,/v1/destroyPlan/createDestroyPlan)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnDestroyPlanDtos {
private YqnDestroyPlanDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateDestroyPlanRequest {
/** 销毁的仓库 code。 */
public String warehouseCode;
/** 来源单号(OMS 销毁单号)。 */
public String sourceNo;
/** 0 可售库存 / 1 不可售库存。 */
public Integer inventoryType;
/** 期望销毁日期 {@code yyyy-MM-dd}(字段名是仓方的 {@code Data},不是笔误)。 */
public String hopeDestroyData;
public String remark;
public List<DestroyPlanItem> destroyPlanOrderItems;
public List<DestroyPlanAttach> orderAttaches;
/** 待销毁商品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class DestroyPlanItem {
public String sku;
public Integer planQty;
}
/** 附件。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class DestroyPlanAttach {
public String name;
public String remark;
/** 0 面单 / 1 装箱单 / 2 提单 / 3 其他。 */
public Integer attachType;
public String url;
}
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateDestroyPlanResponse {
/** 仓侧销毁计划单号。 */
public String destroyPlanOrderNo;
}
}

1174
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java

File diff suppressed because it is too large Load Diff

48
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnFeeDetailDtos.java

@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:结算明细(API 133,/v1/warehouse/operation/costs/detail)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnFeeDetailDtos {
private YqnFeeDetailDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CostDetailRequest {
/** 销售订单号(数字);作业费 / 尾程费按它查。 */
public Long saleOrderNo;
/** 结算单编号;仓储费 / 增值服务费按它查。 */
public String billingTransNo;
/** 1 作业费 / 2 仓储费 / 3 增值服务费 / 4 尾程费。 */
public Integer costType;
public String sku;
public String externalOrderNo;
/** 快照开始日期 yyyy-MM-dd;仅仓储费支持,区间不超过 30 天。 */
public String snapshotStartDate;
/** 快照结束日期 yyyy-MM-dd。 */
public String snapshotEndDate;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CostDetail {
/** 销售订单号(数字)。 */
public Long saleOrderNo;
public String warehouseCode;
/** 费用金额,币种 USD。 */
public Double costAmount;
public String costName;
public String settlementTime;
/** 1 实际结算 / 2 预估结算。 */
public Integer settlementType;
}
}

77
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnFeeEstimateDtos.java

@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:订单测算 / 运费试算(API 121,/v1/saleOrder/calculate)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnFeeEstimateDtos {
private YqnFeeEstimateDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CalculateRequest {
/** 尺寸单位:0 英寸 / 1 厘米。 */
public Integer sizeUnit;
public Double length;
public Double width;
public Double height;
/** 重量单位:0 磅 / 1 盎司 / 2 克。 */
public Integer weightUnit;
public Double weight;
/** 保价货值。 */
public Double insuredValue;
public List<CalculateSkuItem> warehouseSkuItem;
public String receiveCountry;
public String receiveState;
public String receiveCity;
public String receivePostal;
public String receiveAddress;
/** 1 住宅地址 / 0 商业地址。 */
public Integer isResidential;
/** 物流产品服务,如 FedEx_FEDEX_GROUND。 */
public String logisticsServiceCode;
public String logisticsProductCode;
/** 签名服务:NO_SIGNATURE / ADULT_SIGNATURE / SIGNATURE / INDIRECT_SIGNATURE。 */
public String signService;
/** 发货仓库。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CalculateSkuItem {
/** 发货仓库 code,必填。 */
public String shipOrgWarehouseCode;
}
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CalculateResult {
public String shipOrgWarehouseCode;
public List<CalculateCarrierItem> calculationCarrierItems;
/** 一个渠道的报价。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CalculateCarrierItem {
public String carrier;
public String logisticsServiceCode;
public String currency;
public Double totalRate;
public List<CalculateCostItem> calculationCostItems;
}
/** 细分成本项。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CalculateCostItem {
public String costName;
public Double estimatedCost;
public String currency;
}
}
}

87
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnInboundPlanDtos.java

@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:查询入库计划(API 101,/v1/inbound/getInboundPlanInfo)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnInboundPlanDtos {
private YqnInboundPlanDtos() {
}
/** 查询入库计划请求(API 101):入库单号或来源单号都能传。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class GetInboundPlanRequest {
public String orderNo;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InboundPlanInfo {
public String orgWarehouseCode;
public String lineName;
/** 库存类型;文档标为 string。 */
public String inventoryType;
public String inboundPlanOrderNo;
/** 0 草稿 / 5 待审核 / 6 审核拒回 / 8 待装箱 / 10 待发货 / 16 收货中 /
* 17 已收货 / 20 待入库 / 25 入库中 / 70 已完成 / 100 已取消。 */
public String inboundPlanOrderStatus;
public String sourceNo;
public String shipmentId;
public String referenceId;
public String shipmentNo;
public String estimateArriveTime;
public String actualArriveTime;
public String firstReceptionDate;
public String shipperName;
public String shipperAddress;
public String shipperContact;
public String shipperPhone;
/** 货物形态。 */
public String goodsType;
public String gpQuantity20;
public String gpCartonNo20;
public String gpQuantity40;
public String gpCartonNo40;
public String hqQuantity40;
public String hqCartonNo40;
public String hqQuantity45;
public String hqCartonNo45;
/** 纸箱数;文档标为 string。 */
public String cartonQty;
public Integer planQty;
public Integer packedQty;
public Integer receivedQty;
/** 总重量(kg)。 */
public Double totalWeight;
/** 总体积(CBM)。 */
public Double totalVolume;
public String actualShipDate;
public Double cartonTotalWeight;
public Double cartonTotalVolume;
public String remark;
/** 产品详情(计划 / 装箱 / 实收)。 */
public List<PlanProductDetail> planProductDetailParamList;
/** 产品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class PlanProductDetail {
public String sku;
public Integer qty;
public Integer qtyPacked;
/** 上架数量。 */
public Integer qtyReceived;
public Integer qtyReceivedSaleable;
public Integer qtyReceivedUnsaleable;
/** 最近上架时间。 */
public String receivedTime;
}
}
}

91
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnInventoryDtos.java

@ -0,0 +1,91 @@ @@ -0,0 +1,91 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:库存查询(API 107,/v2/inventory/get_inventory_by_page)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnInventoryDtos {
private YqnInventoryDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InventoryQueryParam {
/** 仓库 CODE 列表,必填。 */
public List<String> warehouseCodes;
/** 0 可售 / 1 不可售。 */
public Integer inventoryType;
/** 页码,字符串。 */
public String page;
/** 页面大小,默认最高 500。 */
public Integer rows;
public String sidx;
/** asc / desc。 */
public String sort;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InventoryPage {
public InventoryPageData data;
/** 分页载荷。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InventoryPageData {
public List<InventoryRow> content;
public Integer totalElements;
public Integer totalPages;
public Boolean last;
public Integer size;
public Integer number;
}
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class InventoryRow {
@com.fasterxml.jackson.annotation.JsonProperty("warehouse_code")
public String warehouseCode;
@com.fasterxml.jackson.annotation.JsonProperty("line_name")
public String lineName;
public String sku;
/** 0 可售 / 1 不可售。 */
@com.fasterxml.jackson.annotation.JsonProperty("inventory_type")
public Integer inventoryType;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_available")
public Integer inventoryAvailable;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_reserved")
public Integer inventoryReserved;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_transport")
public Integer inventoryTransport;
/** 当前总库存;文档标为 string。 */
@com.fasterxml.jackson.annotation.JsonProperty("inventory_current")
public String inventoryCurrent;
@com.fasterxml.jackson.annotation.JsonProperty("updated_at")
public String updatedAt;
@com.fasterxml.jackson.annotation.JsonProperty("is_over_warehouse")
public Integer isOverWarehouse;
@com.fasterxml.jackson.annotation.JsonProperty("parent_sku")
public String parentSku;
/** 0 单一产品 / 1 套装 / 2 箱产品。 */
@com.fasterxml.jackson.annotation.JsonProperty("sale_type")
public Integer saleType;
@com.fasterxml.jackson.annotation.JsonProperty("standard_quantity")
public Integer standardQuantity;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_pcs_available")
public Integer inventoryPcsAvailable;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_pcs_reserved")
public Integer inventoryPcsReserved;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_pcs_transport")
public Integer inventoryPcsTransport;
@com.fasterxml.jackson.annotation.JsonProperty("inventory_pcs_current")
public Integer inventoryPcsCurrent;
}
}

27
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnLogisticsProductDtos.java

@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:物流产品服务清单(API 135,/v2/sysCarrierGroup/getCarrierGroupList)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnLogisticsProductDtos {
private YqnLogisticsProductDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CarrierGroup {
/** 产品 code;出库下单与运费试算的入参。 */
public String logisticsProductCode;
public String logisticsProductName;
/** 是否跨国运输。 */
public Boolean crossCountry;
}
}

148
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnOrderDetailDtos.java

@ -0,0 +1,148 @@ @@ -0,0 +1,148 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:订单详情(API 128,/v1/saleOrder/findOne)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnOrderDetailDtos {
private YqnOrderDetailDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class FindOneOrderRequest {
/** 订单号;运去哪指我们下发时的 {@code orderNo}(来源单号)。 */
public String orderNo;
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class OrderDetail {
public String orderNo;
/** 支付时间 {@code yyyy-MM-dd HH:mm:ss}。 */
public String paidAt;
public String shipToContact;
public String shipToAddress1;
public String shipToAddress2;
public String shipToAddress3;
public String shipToCity;
public String shipToState;
public String shipToCountry;
public String shipToPostal;
public String shipToTelephone;
/** 仓 code,可能因分仓规则与下单时不同。 */
public String warehouseCode;
/** 承运商 code。 */
public String carrierCode;
public String thirdPartyAccount;
public String currency;
/** 是否签收 0 否 / 1 是。 */
public Integer isSignature;
/** 是否保价 0 否 / 1 是。 */
public Integer isInsure;
/** pending / unshipped / approved / assigned / picked / shipped / canceled / refunded。 */
public String orderStatusEnum;
/** 异常码;无异常为 {@code unexception}。 */
public String errorCode;
/** 预估运费,默认币种 USD。 */
public Double estimatedShippingFee;
public List<DetailProductItem> productItems;
public List<Enclosure> enclosure;
/** 发货信息;未发货时为 null 或空。 */
public List<ShipmentPackage> shipmentPackages;
/** SKU ORD 列表。 */
public List<OrdItem> ordList;
/** 采集 SN 信息。 */
public List<SnInfo> orderSnInfo;
/** 商品行。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class DetailProductItem {
public String sku;
public Integer quantity;
public String parentErpsku;
/** 0 单一产品 / 2 箱产品。 */
public Integer saleType;
public Integer standardQuantity;
public Double skuAmount;
public Double insureAmount;
public String lineNo;
public BatchInfo batchInfo;
}
/** 批次信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class BatchInfo {
public List<BatchItem> planBatchItems;
public List<BatchItem> outboundBatchItems;
}
/** 一条批次。 */
public static final class BatchItem {
public Integer qty;
public List<BatchParam> batchParam;
}
/** 批次属性键值。 */
public static final class BatchParam {
public String batchAttriKey;
public String batchAttriValue;
}
/** 附件。 */
public static final class Enclosure {
public String type;
public String name;
public String url;
}
/**
* 发货包裹。
*
* <p>{@code packageFlag} 0 实际包裹 / 1 面单信息;
* 面单信息行也有 trackingNo,拼包裹时不要重复计数。</p>
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ShipmentPackage {
public String trackingNo;
public String carrier;
public String erpSku;
public Double cost;
public Integer shipedQuantity;
public String shipmentDate;
public Integer packageFlag;
public String carrierCode;
public String carrierServiceCode;
}
/** SKU 的 ORD 列表。 */
public static final class OrdItem {
public String sku;
public List<String> skuOrdList;
}
/** 采集的 SN 信息。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class SnInfo {
public String sku;
public String productId;
public List<SnItem> snList;
}
/** 单条 SN。 */
public static final class SnItem {
public String sku;
public String snCode;
public String lineNo;
public Integer productId;
public Integer deliverOrderItemId;
}
}
}

120
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnProductDtos.java

@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:商品创建 / 编辑(API 115,/v1/product/save)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnProductDtos {
private YqnProductDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class SaveProductRequest {
/** 产品 SKU。 */
public String sku;
/** 自定义产品编码。 */
public String customItemNo;
/** UPC 编码。 */
public String upc;
/** 1 成品 / 2 配件 / 3 耗材;不传默认成品。 */
public Integer productType;
/** 中文名称。 */
public String name;
/** 英文名称。 */
public String nameEn;
/** 产品描述;不填默认取 {@link #nameEn}。 */
public String description;
/** 0 原包装发货 / 1 重新打包。 */
public Integer packingType;
/** 产品长(cm),一箱多件的尺寸。 */
public Double length;
/** 产品宽(cm)。 */
public Double width;
/** 产品高(cm)。 */
public Double height;
/** 产品重量(g)。 */
public Double weight;
/** 单品长(cm)。 */
public Double itemLength;
/** 单品宽(cm)。 */
public Double itemWidth;
/** 单品高(cm)。 */
public Double itemHeight;
/** 保质期管理 0 否 / 1 是。 */
public Integer expirationControl;
/** 保质期天数。 */
public Integer expirationDate;
/** 装箱数量。 */
public Integer packedQty;
/** 外箱长(cm)。 */
public Double packedLength;
/** 外箱宽(cm)。 */
public Double packedWidth;
/** 外箱高(cm)。 */
public Double packedHeight;
/** 外箱重量(g)。 */
public Double packedWeight;
/** 成本。 */
public Double cost;
/** 币种。 */
public String currency;
/** 是否保价 Y / N。 */
public String isInsuranceFlag;
/** 保价费用。 */
public Double isInsuranceRate;
/** 备注。 */
public String remark;
/** 报关中文名。 */
public String customName;
/** 报关英文名。 */
public String customNameEn;
/** 是否需要 SN 0 否 / 1 是。 */
public Integer isRequireSn;
/** 外包装样式 0 裸包装 / 1 销售包装 / 2 物流包装。 */
public Integer packageStyle;
/** 序列号管理方式 1 全链路 SN / 2 SN 出库采集。 */
public Integer snMgmtMode;
/** 客退处理方式 0 客户自提 / 1 拍照确认 / 2 销毁 / 5 仓库确认。 */
public Integer returnDealMethod;
/** 批次管理。 */
public LotControl lotControl;
/** 商品链接。 */
public String link;
/** 清关信息;各国一条。 */
public List<Customs> customs;
/** 批次管理。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class LotControl {
/** 是否开启批次管理 0 否 / 1 是。 */
public Integer lotEnabled;
/** 开启后必填:本商品需要开启的批次属性编码。 */
public List<String> lotAttrCodeList;
}
/** 一条进口海关信息;四项同进同退。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class Customs {
/** 国家编码,如 US。 */
public String countryCode;
/** HS Code。 */
public String customCode;
/** 进口申报价值。 */
public Double importDeclaredValue;
/** 进口申报价值币种,枚举仅 USD。 */
public String importDeclaredCurrency;
/** 出口申报价值。 */
public Double exportDeclaredValue;
/** 出口申报价值币种,枚举仅 USD。 */
public String exportDeclaredCurrency;
}
}
}

31
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnReturnProcessDtos.java

@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:退货条目处理(API 77,/v3/saleReturn/addProcessMode)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnReturnProcessDtos {
private YqnReturnProcessDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class SaleReturnProcessRequest {
/** 退货计划单号,必填。 */
public String saleReturnPlanNo;
/** 明细行 id(来自退货查询的 saleReturnOrderItems[].id),必填。 */
public Long id;
/** 0 客户自提 / 2 销毁 / 3 上架(良品) / 4 换标上架(良品)。 */
public Integer goodsReturnType;
/** 仅 4 换标上架时使用。 */
public String newSku;
public String remark;
}
}

40
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnSkuLabelDtos.java

@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:打印入库计划单 SKU 标(API 100,/v1/inbound/generateItemLabel)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnSkuLabelDtos {
private YqnSkuLabelDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class SkuLabelRequest {
/** 入库计划单号(仓侧 ip 单号)。 */
public String orderNo;
/** 来源单号。 */
public String sourceNo;
/** 1 合成压缩包 / 2 合成一个 pdf。 */
public Integer downloadMode;
/** 纸张大小,1..14(40*30 … 100*100)。 */
public Integer labelSizeType;
/** 原产地国家二字码;不打印时传 null。 */
public String originCountry;
/** 是否显示英文名称。 */
public Boolean isShowEn;
/** 是否展示中文名称;默认否。 */
public Boolean isShowCn;
/** 是否展示二维码;默认是。 */
public Boolean isShowQrCode;
/** 是否展示 ERP_SKU;默认是。 */
public Boolean isShowErpSku;
}
}

85
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnTrackingDtos.java

@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:获取运单物流状态(API 189,/api/v2/orderShipment/track/{trackingNo})。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnTrackingDtos {
private YqnTrackingDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class ShipmentTrack {
/** 运单 id。 */
public Long id;
public String carrier;
public String trackingCode;
/** 最新状态;取值同 {@code trackingDetails[].status}。 */
public String status;
/** 状态详情。 */
public String statusDetail;
/** 预计妥投时间。 */
public String estDeliveryDate;
/** 签收人。 */
public String signedBy;
/** 承运商公开查询地址。 */
public String publicUrl;
public Double weight;
public List<TrackDetail> trackingDetails;
public Parcel parcel;
public CarrierDetail carrierDetail;
/** 一个轨迹节点。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class TrackDetail {
public String status;
public String message;
/** 时间点(格式未在文档中给出,按多种格式尝试解析)。 */
public String datetime;
public String statusDetail;
public String timeZone;
public TrackingLocation trackingLocation;
}
/** 节点地理位置。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class TrackingLocation {
public String city;
public String state;
public String country;
public String zip;
}
/** 包裹信息;重量单位 oz、尺寸单位 inch(仓方固定口径)。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class Parcel {
public Double weight;
public Double length;
public Double width;
public Double height;
public String weightUnits;
public String packageDimensionsUnits;
}
/** 承运商明细。 */
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CarrierDetail {
/** 物流服务。 */
public String service;
public String containerType;
public String originLocation;
public String destinationLocation;
public String guaranteedDeliveryDate;
public String alternateIdentifier;
public String initialDeliveryAttempt;
}
}
}

108
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnTransferDtos.java

@ -0,0 +1,108 @@ @@ -0,0 +1,108 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:创建调拨单(API 139,/v2/transferOutboundPlan/create)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnTransferDtos {
private YqnTransferDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateTransferPlanRequest {
/** 0 亚马逊移出 / 1 亚马逊移入 / 2 仓-仓调拨 / 3 调拨出库。 */
public Integer type;
/** 出库仓 code;没有填 Other。 */
public String orgWarehouseCode;
/** 入库仓 code;没有填 Other。 */
public String inOrgWarehouseCode;
/** 0 可售 / 1 不可售。 */
public Integer inventoryType;
/** 运送类型 1 卡车派送 / 2 快递派送。 */
public Integer transportationCarrierType;
/** 运输方式 1 客户自提 / 2 仓库预约卡车 / 3 仓库物流 / 4 客户物流面单。 */
public Integer transportationType;
/** 来源单号;唯一约束,查询与取消都靠它。 */
public String sourceNo;
/** 期望出库日期 yyyy-MM-dd。 */
public String estimateOutboundAt;
/** 期望入库日期 yyyy-MM-dd。 */
public String estimateInboundAt;
public String shipmentId;
public String removeOrderId;
/** 目的地地址 code。 */
public String receiveStore;
public String shipToCountry;
public String shipToState;
public String shipToCity;
public String shipToPostal;
public String shipToAddress1;
public String shipToContact;
public String shipToTelephone;
public String remark;
/** 增值服务 1 贴产品标 / 2 贴箱标 / 3 贴托盘标。 */
public List<Integer> serviceType;
public String truckCompany;
/** 提货时间 yyyy-MM-dd。 */
public String pickupTime;
/** 产品明细,必填。 */
public List<TransferItem> transferOutboundPlanItems;
/** 标签 150 采集 SN / 160 后置提供 BOL。 */
public List<Integer> tags;
public List<TransferBatchItem> batchItems;
/** 产品行。 */
public static final class TransferItem {
public String sku;
public Integer qty;
}
/** 批次明细。 */
public static final class TransferBatchItem {
public String sku;
public Integer qty;
public List<BatchAttr> batchParam;
}
/** 批次属性键值;运去哪调拨与入库用的是同一套 key(如 ProductionDateNumber)。 */
public static final class BatchAttr {
public String batchAttriKey;
public String batchAttriValue;
}
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class CreateTransferPlanResponse {
public String transferOutboundPlanNo;
public Integer transferOutboundPlanStatus;
public String sourceNo;
public String orgWarehouseCode;
public String inOrgWarehouseCode;
public Integer totalQuantity;
public String estimateOutboundAt;
public String estimateInboundAt;
public String trackingNo;
public String remark;
/** 调出仓名称。 */
public String orgWarehouseTitle;
/** 调入仓名称。 */
public String inOrgWarehouseTitle;
public String carrierCode;
/** 总重量;运去哪未标单位。 */
public Double totalWeight;
/** 总体积;运去哪未标单位。 */
public Double totalVolume;
/** 异常 code;调拨失败时定位原因用。 */
public String errorCode;
public String errorReason;
}
}

33
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnWarehouseDtos.java

@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
package common.ecommerce.yqn.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.util.List;
/**
* 运去哪报文结构:查询仓库(API 134,/v1/warehouse/findAll)。
*
* <p>一个文件对应一个接口,只放该接口的请求 / 响应与内嵌子结构;
* 与其它接口共用的结构各自复制一份,避免跨接口耦合。</p>
*/
public final class YqnWarehouseDtos {
private YqnWarehouseDtos() {
}
@JsonInclude(JsonInclude.Include.NON_NULL)
public static final class WarehouseRow {
public String warehouseCode;
public String name;
public String country;
public String state;
public String city;
public String address1;
public String address2;
public String postal;
/** 联系人。 */
public String linkman;
public String mobilePhone;
public String email;
}
}
Loading…
Cancel
Save