emptyList() : failures;
+ return this;
+ }
+
+ public ShipmentReviewResult build() {
+ return new ShipmentReviewResult(this);
+ }
+ }
+}
diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java b/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
new file mode 100644
index 0000000..b5f2dd4
--- /dev/null
+++ b/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
@@ -0,0 +1,154 @@
+package common.ecommerce.model.fulfillment;
+
+import common.ecommerce.model.ChannelProvider;
+
+import java.util.Objects;
+
+/**
+ * 销售出库单物流面单。
+ *
+ * 内容以 base64 返回,不落文件;{@code fileType} 是扩展名(如 {@code pdf}),
+ * 由调用方决定解码与存储方式。
+ */
+public final class ShippingLabel {
+
+ private final String omsStoreId;
+ private final ChannelProvider sourceProvider;
+ private final String woNumber;
+ private final String orderNumber;
+ private final Long logisticsProviderId;
+ private final Long logisticsTypeId;
+ private final Long fileId;
+ private final String fileType;
+ private final String fileSize;
+ private final String contentBase64;
+
+ private ShippingLabel(Builder b) {
+ this.omsStoreId = Objects.requireNonNull(b.omsStoreId, "omsStoreId");
+ this.sourceProvider = Objects.requireNonNull(b.sourceProvider, "sourceProvider");
+ this.woNumber = Objects.requireNonNull(b.woNumber, "woNumber");
+ this.orderNumber = b.orderNumber;
+ this.logisticsProviderId = b.logisticsProviderId;
+ this.logisticsTypeId = b.logisticsTypeId;
+ this.fileId = b.fileId;
+ this.fileType = b.fileType;
+ this.fileSize = b.fileSize;
+ this.contentBase64 = b.contentBase64;
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ public String omsStoreId() {
+ return omsStoreId;
+ }
+
+ public ChannelProvider sourceProvider() {
+ return sourceProvider;
+ }
+
+ /** 销售出库单号。 */
+ public String woNumber() {
+ return woNumber;
+ }
+
+ public String orderNumber() {
+ return orderNumber;
+ }
+
+ public Long logisticsProviderId() {
+ return logisticsProviderId;
+ }
+
+ public Long logisticsTypeId() {
+ return logisticsTypeId;
+ }
+
+ public Long fileId() {
+ return fileId;
+ }
+
+ /** 文件类型,如 {@code pdf}。 */
+ public String fileType() {
+ return fileType;
+ }
+
+ /** 文件尺寸描述,平台原值。 */
+ public String fileSize() {
+ return fileSize;
+ }
+
+ /** 面单 base64;平台可能返回空串。 */
+ public String contentBase64() {
+ return contentBase64;
+ }
+
+ public static final class Builder {
+
+ private String omsStoreId;
+ private ChannelProvider sourceProvider;
+ private String woNumber;
+ private String orderNumber;
+ private Long logisticsProviderId;
+ private Long logisticsTypeId;
+ private Long fileId;
+ private String fileType;
+ private String fileSize;
+ private String contentBase64;
+
+ public Builder omsStoreId(String omsStoreId) {
+ this.omsStoreId = omsStoreId;
+ return this;
+ }
+
+ public Builder sourceProvider(ChannelProvider sourceProvider) {
+ this.sourceProvider = sourceProvider;
+ return this;
+ }
+
+ public Builder woNumber(String woNumber) {
+ this.woNumber = woNumber;
+ return this;
+ }
+
+ public Builder orderNumber(String orderNumber) {
+ this.orderNumber = orderNumber;
+ return this;
+ }
+
+ public Builder logisticsProviderId(Long logisticsProviderId) {
+ this.logisticsProviderId = logisticsProviderId;
+ return this;
+ }
+
+ public Builder logisticsTypeId(Long logisticsTypeId) {
+ this.logisticsTypeId = logisticsTypeId;
+ return this;
+ }
+
+ public Builder fileId(Long fileId) {
+ this.fileId = fileId;
+ return this;
+ }
+
+ public Builder fileType(String fileType) {
+ this.fileType = fileType;
+ return this;
+ }
+
+ public Builder fileSize(String fileSize) {
+ this.fileSize = fileSize;
+ return this;
+ }
+
+ public Builder contentBase64(String contentBase64) {
+ this.contentBase64 = contentBase64;
+ return this;
+ }
+
+ public ShippingLabel build() {
+ return new ShippingLabel(this);
+ }
+ }
+}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingApi.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingApi.java
index 2c7fc1b..84a03e6 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingApi.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingApi.java
@@ -94,6 +94,18 @@ public enum LingxingApi {
/** 快速出库结果查询。POST,qps 10,多平台通用。 */
FAST_OUTBOUND_RESULT("/pb/mp/order/v2/getFastOutboundResult", 10),
+ /** 销售出库单列表。POST,page/page_size 分页(上限 200),默认最近一个月,令牌桶 1。 */
+ OUTBOUND_ORDER_LIST("/erp/sc/routing/wms/order/wmsOrderList", 1),
+
+ /** 销售出库单物流面单。POST,按销售出库单号或系统单号查,单次上限 50。 */
+ LOGISTICS_LABEL_LIST("/erp/sc/routing/wms/order/getWmsLogisticsLabels", 1),
+
+ /** 审核发货。POST,global_order_no 数组,令牌桶 1。 */
+ ORDER_REVIEW("/basicOpen/openapi/multiplatform/order/review", 1),
+
+ /** 编辑订单(仓库 / 物流方式 / 包裹规格 / 报关)。POST,单次 1~50 单,令牌桶 10。 */
+ ORDER_EDIT("/pb/mp/order/editOrder", 10),
+
/** 多平台订单列表;当前实现使用的跨平台接口。 */
ORDER_LIST("/pb/mp/order/v2/list", 10);
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
index d12cfed..87377de 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
@@ -64,6 +64,13 @@ public final class LingxingConstants {
/** 结算时间查询跨度上限:7 天(双闭区间)。 */
public static final int SETTLEMENT_MAX_QUERY_DAYS = 7;
+ /** 销售出库单分页 page_size 上限。 */
+ public static final int OUTBOUND_ORDER_MAX_PAGE_SIZE = 200;
+ /** 物流面单单次查询上限(销售出库单号与系统单号各自上限 50)。 */
+ public static final int LABEL_MAX_BATCH = 50;
+ /** 编辑订单单次上限。 */
+ public static final int ORDER_EDIT_MAX_BATCH = 50;
+
private LingxingConstants() {
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
index 9399b70..dce9218 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
@@ -1,10 +1,14 @@
package common.ecommerce.lingxing.adapter;
import common.ecommerce.capability.AggregatorCapable;
+import common.ecommerce.capability.OrderEditCapable;
import common.ecommerce.capability.OutboundCapable;
+import common.ecommerce.capability.OutboundOrderCapable;
import common.ecommerce.capability.ProductCapable;
import common.ecommerce.capability.SalesOrderCapable;
import common.ecommerce.capability.SettlementCapable;
+import common.ecommerce.capability.ShipmentReviewCapable;
+import common.ecommerce.capability.ShippingLabelCapable;
import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException;
import common.ecommerce.http.HttpTransport;
@@ -15,10 +19,18 @@ import common.ecommerce.lingxing.auth.LingxingTokenClient;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.lingxing.platform.LingxingCall;
+import common.ecommerce.lingxing.platform.LingxingLabelSource;
+import common.ecommerce.lingxing.platform.LingxingOrderEditSource;
+import common.ecommerce.lingxing.platform.LingxingOutboundOrderSource;
+import common.ecommerce.lingxing.platform.LingxingShipmentReviewSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.LingxingSubPlatformDefaults;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatforms;
+import common.ecommerce.lingxing.platform.wms.OrderEditSource;
+import common.ecommerce.lingxing.platform.wms.ShipmentReviewSource;
+import common.ecommerce.lingxing.platform.wms.WmsLabelSource;
+import common.ecommerce.lingxing.platform.wms.WmsOutboundOrderSource;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
@@ -26,8 +38,15 @@ import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
+import common.ecommerce.model.fulfillment.LabelQuery;
+import common.ecommerce.model.fulfillment.OrderEditRequest;
+import common.ecommerce.model.fulfillment.OrderEditResult;
+import common.ecommerce.model.fulfillment.OutboundOrder;
+import common.ecommerce.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.model.fulfillment.OutboundPackage;
import common.ecommerce.model.fulfillment.OutboundResult;
+import common.ecommerce.model.fulfillment.ShipmentReviewResult;
+import common.ecommerce.model.fulfillment.ShippingLabel;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
@@ -57,7 +76,8 @@ import java.util.Set;
* {@link LingxingSubPlatform}。
*/
public final class LingxingAdapter implements SalesOrderCapable, ProductCapable, SettlementCapable,
- OutboundCapable, AggregatorCapable {
+ OutboundCapable, OutboundOrderCapable, ShippingLabelCapable, ShipmentReviewCapable,
+ OrderEditCapable, AggregatorCapable {
private final HttpTransport transport;
private final JacksonJsonCodec json;
@@ -67,6 +87,15 @@ public final class LingxingAdapter implements SalesOrderCapable, ProductCapable,
private final LingxingSubPlatforms subPlatforms;
/**
+ * ERP 级接口不区分平台,全部子平台共用同一实现,因此直接由适配器持有。
+ * 这些 Source 无状态,构造一次即可复用。
+ */
+ private final LingxingOutboundOrderSource outboundOrderSource;
+ private final LingxingLabelSource labelSource;
+ private final LingxingShipmentReviewSource shipmentReviewSource;
+ private final LingxingOrderEditSource orderEditSource;
+
+ /**
* 适配器只持有协议与基础设施,不持有端点与凭据——两者随每次调用传入。
*
* 子平台装配默认用 {@code LingxingSubPlatformDefaults.all(...)};
@@ -110,6 +139,10 @@ public final class LingxingAdapter implements SalesOrderCapable, ProductCapable,
this.requestFactory = new LingxingRequestFactory(json, clock);
this.subPlatforms = subPlatforms != null ? subPlatforms
: LingxingSubPlatformDefaults.all(transport, json);
+ this.outboundOrderSource = new WmsOutboundOrderSource();
+ this.labelSource = new WmsLabelSource();
+ this.shipmentReviewSource = new ShipmentReviewSource();
+ this.orderEditSource = new OrderEditSource();
}
@Override
@@ -132,7 +165,9 @@ public final class LingxingAdapter implements SalesOrderCapable, ProductCapable,
@Override
public EnumSet capabilities() {
- return EnumSet.of(Capability.SALES_ORDER, Capability.PRODUCT, Capability.BILLING, Capability.MARK_SHIPPED);
+ return EnumSet.of(Capability.SALES_ORDER, Capability.PRODUCT, Capability.BILLING,
+ Capability.MARK_SHIPPED, Capability.OUTBOUND_ORDER, Capability.LABEL,
+ Capability.SHIPMENT_REVIEW, Capability.ORDER_EDIT);
}
/**
@@ -163,6 +198,19 @@ public final class LingxingAdapter implements SalesOrderCapable, ProductCapable,
if (capability == Capability.MARK_SHIPPED) {
return impl.outboundSource() != null;
}
+ // ERP 级接口(出库单 / 面单 / 审核发货)不按子平台区分,平台登记即支持
+ if (capability == Capability.OUTBOUND_ORDER) {
+ return outboundOrderSource != null;
+ }
+ if (capability == Capability.LABEL) {
+ return labelSource != null;
+ }
+ if (capability == Capability.SHIPMENT_REVIEW) {
+ return shipmentReviewSource != null;
+ }
+ if (capability == Capability.ORDER_EDIT) {
+ return orderEditSource != null;
+ }
return false;
}
@@ -259,6 +307,30 @@ public final class LingxingAdapter implements SalesOrderCapable, ProductCapable,
return source;
}
+ /** 销售出库单列表(ERP 级,按店铺过滤)。 */
+ @Override
+ public Page pull(ChannelContext ctx, OutboundOrderQuery query) {
+ return outboundOrderSource.outboundOrders(call(ctx), query);
+ }
+
+ /** 销售出库单物流面单。 */
+ @Override
+ public List labels(ChannelContext ctx, LabelQuery query) {
+ return labelSource.labels(call(ctx), query);
+ }
+
+ /** 审核发货;逐单成败在返回值里,不靠异常表达。 */
+ @Override
+ public ShipmentReviewResult review(ChannelContext ctx, List globalOrderNos) {
+ return shipmentReviewSource.review(call(ctx), globalOrderNos);
+ }
+
+ /** 批量编辑订单(仓库 / 物流方式 / 包裹规格 / 报关)。 */
+ @Override
+ public OrderEditResult edit(ChannelContext ctx, List requests) {
+ return orderEditSource.edit(call(ctx), requests);
+ }
+
@Override
public ProductSyncStrategy syncStrategy() {
// 亚马逊 Listing 支持按「All Listing 报表更新时间」增量;其它子平台接入时再各自声明
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java
new file mode 100644
index 0000000..4022a18
--- /dev/null
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java
@@ -0,0 +1,17 @@
+package common.ecommerce.lingxing.platform;
+
+import common.ecommerce.model.fulfillment.LabelQuery;
+import common.ecommerce.model.fulfillment.ShippingLabel;
+
+import java.util.List;
+
+/**
+ * 物流面单能力。
+ *
+ * 领星按销售出库单号或系统单号批量返回 base64 面单,不区分平台。
+ */
+public interface LingxingLabelSource {
+
+ /** 批量取面单。 */
+ List labels(LingxingCall call, LabelQuery query);
+}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java
new file mode 100644
index 0000000..67343b8
--- /dev/null
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java
@@ -0,0 +1,17 @@
+package common.ecommerce.lingxing.platform;
+
+import common.ecommerce.model.fulfillment.OrderEditRequest;
+import common.ecommerce.model.fulfillment.OrderEditResult;
+
+import java.util.List;
+
+/**
+ * 订单编辑能力(仓库 / 物流方式 / 包裹规格 / 报关)。
+ *
+ * 写操作;按领星系统单号批量编辑待审核的自发货订单。
+ */
+public interface LingxingOrderEditSource {
+
+ /** 批量编辑订单。 */
+ OrderEditResult edit(LingxingCall call, List requests);
+}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
new file mode 100644
index 0000000..018bebb
--- /dev/null
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
@@ -0,0 +1,16 @@
+package common.ecommerce.lingxing.platform;
+
+import common.ecommerce.model.fulfillment.OutboundOrder;
+import common.ecommerce.model.fulfillment.OutboundOrderQuery;
+import common.ecommerce.model.support.Page;
+
+/**
+ * 子平台 / 账户的销售出库单能力。
+ *
+ * 领星这套接口不带平台维度,按当前账户的店铺 id 过滤,因此所有子平台共用同一实现。
+ */
+public interface LingxingOutboundOrderSource {
+
+ /** 分页拉取销售出库单。 */
+ Page outboundOrders(LingxingCall call, OutboundOrderQuery query);
+}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java
new file mode 100644
index 0000000..d300c8e
--- /dev/null
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java
@@ -0,0 +1,16 @@
+package common.ecommerce.lingxing.platform;
+
+import common.ecommerce.model.fulfillment.ShipmentReviewResult;
+
+import java.util.List;
+
+/**
+ * 审核发货能力。
+ *
+ * 写操作;按领星系统单号批量推进订单状态。
+ */
+public interface LingxingShipmentReviewSource {
+
+ /** 批量审核发货。 */
+ ShipmentReviewResult review(LingxingCall call, List globalOrderNos);
+}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/OrderEditSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/OrderEditSource.java
new file mode 100644
index 0000000..295e4d9
--- /dev/null
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/OrderEditSource.java
@@ -0,0 +1,152 @@
+package common.ecommerce.lingxing.platform.wms;
+
+import common.ecommerce.error.ChannelException;
+import common.ecommerce.error.ValidationException;
+import common.ecommerce.http.HttpRequest;
+import common.ecommerce.http.HttpResponse;
+import common.ecommerce.http.Responses;
+import common.ecommerce.lingxing.LingxingApi;
+import common.ecommerce.lingxing.LingxingConstants;
+import common.ecommerce.lingxing.platform.LingxingCall;
+import common.ecommerce.lingxing.platform.LingxingOrderEditSource;
+import common.ecommerce.lingxing.platform.wms.dto.OrderEditErrorDto;
+import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.model.fulfillment.DeclaredItem;
+import common.ecommerce.model.fulfillment.OrderEditRequest;
+import common.ecommerce.model.fulfillment.OrderEditResult;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 领星 · 编辑订单({@code POST /pb/mp/order/editOrder})。
+ *
+ * 单次 1~50 单,可分别编辑仓库、物流方式、包裹预估规格与报关信息。
+ *
+ * 业务码不能交给 {@code LingxingEnvelope} 判:这个接口用
+ * {@code 0} / {@code 10000} / {@code 10001} 表示「全成功 / 全失败 / 部分成功」,
+ * 都属于正常响应,逐单原因在 {@code data.error_details[]}。
+ * 只有其它码(限流、token 失效、参数错误)才走统一信封抛异常。
+ */
+public final class OrderEditSource implements LingxingOrderEditSource {
+
+ private static final String OP = "orders.edit";
+
+ private static final String CODE_SUCCESS = "0";
+ private static final String CODE_ALL_FAILED = "10000";
+ private static final String CODE_PARTIAL = "10001";
+
+ @Override
+ public OrderEditResult edit(LingxingCall call, List requests) {
+ if (requests == null || requests.isEmpty()) {
+ throw validation(call, "requests must not be empty");
+ }
+ if (requests.size() > LingxingConstants.ORDER_EDIT_MAX_BATCH) {
+ throw validation(call, "at most " + LingxingConstants.ORDER_EDIT_MAX_BATCH
+ + " orders per call, got " + requests.size());
+ }
+
+ List