diff --git a/GUIDE.md b/GUIDE.md
index d380f6e..b698c47 100644
--- a/GUIDE.md
+++ b/GUIDE.md
@@ -381,6 +381,10 @@ if (r.alreadyCompleted()) {
```xml
ecommerce
+ common-ecommerce-common
+
+
+ ecommerce
common-ecommerce-core
diff --git a/README.md b/README.md
index 2fa5895..515e815 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,21 @@
| 模块 | 职责 |
|:---|:---|
-| `common-ecommerce-core` | 领域模型、能力接口、门面、管道、SPI。**零第三方运行时依赖** |
-| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码 |
+| `common-ecommerce-common` | **跨域共享层**:异常体系、SPI 契约、幂等、审计、水位线、通用值对象(Money / Page / PlatformTime / 枚举)。不依赖任何领域模块 |
+| `common-ecommerce-core` | 渠道域:领域模型、能力接口、门面、同步管道。依赖 `common` |
+| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码。依赖 `common`,**不依赖 `core`** |
| `common-ecommerce-testkit` | InMemory SPI 与测试替身 |
| `common-ecommerce-lingxing` | 领星聚合适配器(多子平台)。DTO 用 Lombok 生成访问器 |
+依赖方向:
+```
+core ─┐
+http ─┼──→ common
+testkit ─┘
+lingxing ──→ core, http, common
+```
+渠道域与未来的仓库域平级,互不依赖,只共享 `common`。`http` 不依赖 `core`,仓库域可以直接复用传输层与令牌管理。
+
**Lombok 使用范围**:仅 `lingxing` 模块的 `dto/*`,`scope=provided`,不进宿主运行时。
`core` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限,
而 `core` 要尽量少依赖编译期工具。
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000..7f70c4a
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,30 @@
+
+
+ 4.0.0
+
+
+ ecommerce
+ common-ecommerce
+ 1.0.0-SNAPSHOT
+
+
+ common-ecommerce-common
+
+ 跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。
+ 不依赖任何领域模块,供渠道域(core)与仓库域复用。
+
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+
diff --git a/core/src/main/java/common/ecommerce/audit/CallObserver.java b/common/src/main/java/common/ecommerce/shared/audit/CallObserver.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/audit/CallObserver.java
rename to common/src/main/java/common/ecommerce/shared/audit/CallObserver.java
index f6b0b2e..23f5f38 100644
--- a/core/src/main/java/common/ecommerce/audit/CallObserver.java
+++ b/common/src/main/java/common/ecommerce/shared/audit/CallObserver.java
@@ -1,4 +1,4 @@
-package common.ecommerce.audit;
+package common.ecommerce.shared.audit;
/**
* SDK 调用观察者:操作日志 / 审计日志的宿主扩展点。
diff --git a/core/src/main/java/common/ecommerce/audit/CallOutcome.java b/common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/audit/CallOutcome.java
rename to common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java
index b1e3f00..c025208 100644
--- a/core/src/main/java/common/ecommerce/audit/CallOutcome.java
+++ b/common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java
@@ -1,4 +1,4 @@
-package common.ecommerce.audit;
+package common.ecommerce.shared.audit;
/**
* 一次 SDK 调用的结果状态。
diff --git a/core/src/main/java/common/ecommerce/audit/CallRecord.java b/common/src/main/java/common/ecommerce/shared/audit/CallRecord.java
similarity index 98%
rename from core/src/main/java/common/ecommerce/audit/CallRecord.java
rename to common/src/main/java/common/ecommerce/shared/audit/CallRecord.java
index 85f3e3e..59e05c3 100644
--- a/core/src/main/java/common/ecommerce/audit/CallRecord.java
+++ b/common/src/main/java/common/ecommerce/shared/audit/CallRecord.java
@@ -1,8 +1,8 @@
-package common.ecommerce.audit;
+package common.ecommerce.shared.audit;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.time.Instant;
import java.time.ZoneId;
diff --git a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java b/common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java
similarity index 99%
rename from core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java
rename to common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java
index fe1bf51..da522f2 100644
--- a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java
+++ b/common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java
@@ -1,4 +1,4 @@
-package common.ecommerce.audit;
+package common.ecommerce.shared.audit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/common/ecommerce/error/AuthException.java b/common/src/main/java/common/ecommerce/shared/error/AuthException.java
similarity index 95%
rename from core/src/main/java/common/ecommerce/error/AuthException.java
rename to common/src/main/java/common/ecommerce/shared/error/AuthException.java
index b721c49..2971149 100644
--- a/core/src/main/java/common/ecommerce/error/AuthException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/AuthException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 认证失败:401/403、token 失效。刷新后重试一次;仍失败则告警并停用账户。
diff --git a/core/src/main/java/common/ecommerce/error/ChannelException.java b/common/src/main/java/common/ecommerce/shared/error/ChannelException.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/error/ChannelException.java
rename to common/src/main/java/common/ecommerce/shared/error/ChannelException.java
index 6211866..a3ec522 100644
--- a/core/src/main/java/common/ecommerce/error/ChannelException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/ChannelException.java
@@ -1,7 +1,7 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
-import common.ecommerce.model.Capability;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.model.Platform;
/**
* 统一异常基类。适配器把平台错误映射到这里;{@code rawResponse} 必须已脱敏。
@@ -18,7 +18,7 @@ public class ChannelException extends RuntimeException {
/** 业务平台;未知时为 null。 */
private final Platform platform;
- /** 接入通道名({@link common.ecommerce.model.ChannelProvider} 的 name);未知时为 null。 */
+ /** 接入通道名({@link common.ecommerce.shared.model.ChannelProvider} 的 name);未知时为 null。 */
private final String provider;
/** 宿主侧店铺 ID;未知时为 null。 */
private final String omsStoreId;
diff --git a/core/src/main/java/common/ecommerce/error/CrossProviderConflictException.java b/common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/error/CrossProviderConflictException.java
rename to common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java
index 18a9216..c26f4d5 100644
--- a/core/src/main/java/common/ecommerce/error/CrossProviderConflictException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 跨 provider 冲突:同一业务动作已由另一个 provider 完成。
diff --git a/core/src/main/java/common/ecommerce/error/IdempotencyConflictException.java b/common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/error/IdempotencyConflictException.java
rename to common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java
index 9c3173f..1c9a0a8 100644
--- a/core/src/main/java/common/ecommerce/error/IdempotencyConflictException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 写操作幂等冲突:重复写。返回已完成结果,不视为失败。
diff --git a/core/src/main/java/common/ecommerce/error/PlatformBusinessException.java b/common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/error/PlatformBusinessException.java
rename to common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java
index ed2755c..1d00b04 100644
--- a/core/src/main/java/common/ecommerce/error/PlatformBusinessException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 平台业务错误码。是否重试视错误码而定,保留 code/message/raw。
diff --git a/core/src/main/java/common/ecommerce/error/RateLimitException.java b/common/src/main/java/common/ecommerce/shared/error/RateLimitException.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/error/RateLimitException.java
rename to common/src/main/java/common/ecommerce/shared/error/RateLimitException.java
index 1c3183a..3193ed5 100644
--- a/core/src/main/java/common/ecommerce/error/RateLimitException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/RateLimitException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 限流:429。遵守 Retry-After 并退避。
diff --git a/core/src/main/java/common/ecommerce/error/TransientException.java b/common/src/main/java/common/ecommerce/shared/error/TransientException.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/error/TransientException.java
rename to common/src/main/java/common/ecommerce/shared/error/TransientException.java
index f8f5e88..9915cb3 100644
--- a/core/src/main/java/common/ecommerce/error/TransientException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/TransientException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 瞬时错误:5xx / 网络 / 超时。退避加抖动后重试,超过上限进入补偿队列。
diff --git a/core/src/main/java/common/ecommerce/error/ValidationException.java b/common/src/main/java/common/ecommerce/shared/error/ValidationException.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/error/ValidationException.java
rename to common/src/main/java/common/ecommerce/shared/error/ValidationException.java
index 0adff2f..adfdbe2 100644
--- a/core/src/main/java/common/ecommerce/error/ValidationException.java
+++ b/common/src/main/java/common/ecommerce/shared/error/ValidationException.java
@@ -1,4 +1,4 @@
-package common.ecommerce.error;
+package common.ecommerce.shared.error;
/**
* 参数或映射错误:4xx。不重试,保留原始报文由人工修正映射。
diff --git a/core/src/main/java/common/ecommerce/idempotency/IdempotencyGuard.java b/common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java
similarity index 95%
rename from core/src/main/java/common/ecommerce/idempotency/IdempotencyGuard.java
rename to common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java
index 2137083..e0d737d 100644
--- a/core/src/main/java/common/ecommerce/idempotency/IdempotencyGuard.java
+++ b/common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java
@@ -1,14 +1,14 @@
-package common.ecommerce.idempotency;
+package common.ecommerce.shared.idempotency;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.CrossProviderConflictException;
-import common.ecommerce.error.IdempotencyConflictException;
-import common.ecommerce.spi.IdempotencyClaim;
-import common.ecommerce.spi.IdempotencyRecord;
-import common.ecommerce.spi.IdempotencyStatus;
-import common.ecommerce.spi.IdempotencyStore;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.CrossProviderConflictException;
+import common.ecommerce.shared.error.IdempotencyConflictException;
+import common.ecommerce.shared.spi.IdempotencyClaim;
+import common.ecommerce.shared.spi.IdempotencyRecord;
+import common.ecommerce.shared.spi.IdempotencyStatus;
+import common.ecommerce.shared.spi.IdempotencyStore;
import java.time.Clock;
import java.time.Instant;
diff --git a/core/src/main/java/common/ecommerce/idempotency/WriteAudit.java b/common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/idempotency/WriteAudit.java
rename to common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
index 2ae51ca..907db57 100644
--- a/core/src/main/java/common/ecommerce/idempotency/WriteAudit.java
+++ b/common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
@@ -1,8 +1,8 @@
-package common.ecommerce.idempotency;
+package common.ecommerce.shared.idempotency;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/common/ecommerce/idempotency/WriteResult.java b/common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
similarity index 98%
rename from core/src/main/java/common/ecommerce/idempotency/WriteResult.java
rename to common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
index 702fb33..6a6daab 100644
--- a/core/src/main/java/common/ecommerce/idempotency/WriteResult.java
+++ b/common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
@@ -1,4 +1,4 @@
-package common.ecommerce.idempotency;
+package common.ecommerce.shared.idempotency;
/**
* 写操作执行结果。
diff --git a/core/src/main/java/common/ecommerce/idempotency/WriteScope.java b/common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
similarity index 95%
rename from core/src/main/java/common/ecommerce/idempotency/WriteScope.java
rename to common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
index f5d7a8f..ebd151d 100644
--- a/core/src/main/java/common/ecommerce/idempotency/WriteScope.java
+++ b/common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
@@ -1,8 +1,8 @@
-package common.ecommerce.idempotency;
+package common.ecommerce.shared.idempotency;
-import common.ecommerce.model.support.CanonicalKeys;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.support.CanonicalKeys;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/model/Capability.java b/common/src/main/java/common/ecommerce/shared/model/Capability.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/model/Capability.java
rename to common/src/main/java/common/ecommerce/shared/model/Capability.java
index 9521cb7..f6f3e9a 100644
--- a/core/src/main/java/common/ecommerce/model/Capability.java
+++ b/common/src/main/java/common/ecommerce/shared/model/Capability.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model;
+package common.ecommerce.shared.model;
/**
* 能力枚举。
diff --git a/core/src/main/java/common/ecommerce/model/ChannelProvider.java b/common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/model/ChannelProvider.java
rename to common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
index 32da2c9..df15153 100644
--- a/core/src/main/java/common/ecommerce/model/ChannelProvider.java
+++ b/common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model;
+package common.ecommerce.shared.model;
/**
* 接入 provider 枚举。
diff --git a/core/src/main/java/common/ecommerce/model/FulfillmentMode.java b/common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
similarity index 90%
rename from core/src/main/java/common/ecommerce/model/FulfillmentMode.java
rename to common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
index 6973294..a4d8ce1 100644
--- a/core/src/main/java/common/ecommerce/model/FulfillmentMode.java
+++ b/common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model;
+package common.ecommerce.shared.model;
/** 履约模式,对应四种业务模式中的 A / C / D;B(FBA/WFS 平台仓发货)只读,不在枚举内。 */
public enum FulfillmentMode {
diff --git a/core/src/main/java/common/ecommerce/model/Platform.java b/common/src/main/java/common/ecommerce/shared/model/Platform.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/model/Platform.java
rename to common/src/main/java/common/ecommerce/shared/model/Platform.java
index 21c177d..0f918b3 100644
--- a/core/src/main/java/common/ecommerce/model/Platform.java
+++ b/common/src/main/java/common/ecommerce/shared/model/Platform.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model;
+package common.ecommerce.shared.model;
/**
* 业务平台枚举。
diff --git a/core/src/main/java/common/ecommerce/spi/AccessToken.java b/common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
similarity index 98%
rename from core/src/main/java/common/ecommerce/spi/AccessToken.java
rename to common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
index 305510a..8c8c686 100644
--- a/core/src/main/java/common/ecommerce/spi/AccessToken.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
import java.time.Instant;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/spi/ChannelSecret.java b/common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
similarity index 99%
rename from core/src/main/java/common/ecommerce/spi/ChannelSecret.java
rename to common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
index a7e4810..7bfb33d 100644
--- a/core/src/main/java/common/ecommerce/spi/ChannelSecret.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/spi/IdempotencyClaim.java b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
similarity index 98%
rename from core/src/main/java/common/ecommerce/spi/IdempotencyClaim.java
rename to common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
index 7bc63a8..619d692 100644
--- a/core/src/main/java/common/ecommerce/spi/IdempotencyClaim.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
/**
* 抢占幂等键的结果。
diff --git a/core/src/main/java/common/ecommerce/spi/IdempotencyRecord.java b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
similarity index 96%
rename from core/src/main/java/common/ecommerce/spi/IdempotencyRecord.java
rename to common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
index 3880409..d3a444b 100644
--- a/core/src/main/java/common/ecommerce/spi/IdempotencyRecord.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
@@ -1,6 +1,6 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/spi/IdempotencyStatus.java b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
similarity index 93%
rename from core/src/main/java/common/ecommerce/spi/IdempotencyStatus.java
rename to common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
index 4cec7a3..62a43ae 100644
--- a/core/src/main/java/common/ecommerce/spi/IdempotencyStatus.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
/**
* 幂等键状态。
diff --git a/core/src/main/java/common/ecommerce/spi/IdempotencyStore.java b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
similarity index 95%
rename from core/src/main/java/common/ecommerce/spi/IdempotencyStore.java
rename to common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
index 60969fc..23e7d01 100644
--- a/core/src/main/java/common/ecommerce/spi/IdempotencyStore.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
@@ -1,6 +1,6 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;
import java.util.Optional;
diff --git a/core/src/main/java/common/ecommerce/spi/LockProvider.java b/common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/spi/LockProvider.java
rename to common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
index 34249ca..d880a50 100644
--- a/core/src/main/java/common/ecommerce/spi/LockProvider.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
import java.util.Optional;
diff --git a/core/src/main/java/common/ecommerce/spi/SecretProvider.java b/common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
similarity index 92%
rename from core/src/main/java/common/ecommerce/spi/SecretProvider.java
rename to common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
index 49f6e42..1e36d3b 100644
--- a/core/src/main/java/common/ecommerce/spi/SecretProvider.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
/**
* 凭证读取 SPI。{@code credentialRef} 由 {@code ChannelAccount} 提供。
diff --git a/core/src/main/java/common/ecommerce/spi/SyncCursorStore.java b/common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
similarity index 91%
rename from core/src/main/java/common/ecommerce/spi/SyncCursorStore.java
rename to common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
index 89edb79..8213d1f 100644
--- a/core/src/main/java/common/ecommerce/spi/SyncCursorStore.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
@@ -1,6 +1,6 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;
diff --git a/core/src/main/java/common/ecommerce/spi/TokenStore.java b/common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
similarity index 94%
rename from core/src/main/java/common/ecommerce/spi/TokenStore.java
rename to common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
index 5d85320..a09cd9d 100644
--- a/core/src/main/java/common/ecommerce/spi/TokenStore.java
+++ b/common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
@@ -1,4 +1,4 @@
-package common.ecommerce.spi;
+package common.ecommerce.shared.spi;
import java.util.Optional;
diff --git a/core/src/main/java/common/ecommerce/model/support/CanonicalKeys.java b/common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/model/support/CanonicalKeys.java
rename to common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
index beb5cc6..450ac62 100644
--- a/core/src/main/java/common/ecommerce/model/support/CanonicalKeys.java
+++ b/common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
@@ -1,7 +1,7 @@
-package common.ecommerce.model.support;
+package common.ecommerce.shared.support;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/core/src/main/java/common/ecommerce/model/support/Money.java b/common/src/main/java/common/ecommerce/shared/support/Money.java
similarity index 99%
rename from core/src/main/java/common/ecommerce/model/support/Money.java
rename to common/src/main/java/common/ecommerce/shared/support/Money.java
index ab2c770..9d27ab6 100644
--- a/core/src/main/java/common/ecommerce/model/support/Money.java
+++ b/common/src/main/java/common/ecommerce/shared/support/Money.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model.support;
+package common.ecommerce.shared.support;
import java.math.BigDecimal;
import java.math.RoundingMode;
diff --git a/core/src/main/java/common/ecommerce/model/support/Page.java b/common/src/main/java/common/ecommerce/shared/support/Page.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/model/support/Page.java
rename to common/src/main/java/common/ecommerce/shared/support/Page.java
index d96864f..904005b 100644
--- a/core/src/main/java/common/ecommerce/model/support/Page.java
+++ b/common/src/main/java/common/ecommerce/shared/support/Page.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model.support;
+package common.ecommerce.shared.support;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/support/PlatformTime.java b/common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
similarity index 98%
rename from core/src/main/java/common/ecommerce/model/support/PlatformTime.java
rename to common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
index 68a0d23..3815adf 100644
--- a/core/src/main/java/common/ecommerce/model/support/PlatformTime.java
+++ b/common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
@@ -1,4 +1,4 @@
-package common.ecommerce.model.support;
+package common.ecommerce.shared.support;
import java.time.Clock;
import java.time.Instant;
diff --git a/core/src/main/java/common/ecommerce/sync/SyncResult.java b/common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
similarity index 97%
rename from core/src/main/java/common/ecommerce/sync/SyncResult.java
rename to common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
index f7fb4d8..1125634 100644
--- a/core/src/main/java/common/ecommerce/sync/SyncResult.java
+++ b/common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
@@ -1,4 +1,4 @@
-package common.ecommerce.sync;
+package common.ecommerce.shared.sync;
/**
* 单次同步结果。
diff --git a/core/src/main/java/common/ecommerce/sync/SyncSpec.java b/common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
similarity index 95%
rename from core/src/main/java/common/ecommerce/sync/SyncSpec.java
rename to common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
index a6b30b7..27f1fa8 100644
--- a/core/src/main/java/common/ecommerce/sync/SyncSpec.java
+++ b/common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
@@ -1,6 +1,6 @@
-package common.ecommerce.sync;
+package common.ecommerce.shared.sync;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import java.time.Duration;
import java.time.Instant;
diff --git a/core/src/test/java/common/ecommerce/audit/Slf4jCallObserverTest.java b/common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
similarity index 97%
rename from core/src/test/java/common/ecommerce/audit/Slf4jCallObserverTest.java
rename to common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
index 407eccf..1c84e01 100644
--- a/core/src/test/java/common/ecommerce/audit/Slf4jCallObserverTest.java
+++ b/common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
@@ -1,9 +1,9 @@
-package common.ecommerce.audit;
+package common.ecommerce.shared.audit;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import org.junit.jupiter.api.Test;
import java.time.Instant;
diff --git a/core/src/test/java/common/ecommerce/idempotency/WriteAuditTest.java b/common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
similarity index 95%
rename from core/src/test/java/common/ecommerce/idempotency/WriteAuditTest.java
rename to common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
index 2b1565e..9186ce3 100644
--- a/core/src/test/java/common/ecommerce/idempotency/WriteAuditTest.java
+++ b/common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
@@ -1,17 +1,17 @@
-package common.ecommerce.idempotency;
-
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.CrossProviderConflictException;
-import common.ecommerce.error.IdempotencyConflictException;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.spi.IdempotencyClaim;
-import common.ecommerce.spi.IdempotencyRecord;
-import common.ecommerce.spi.IdempotencyStatus;
-import common.ecommerce.spi.IdempotencyStore;
+package common.ecommerce.shared.idempotency;
+
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.CrossProviderConflictException;
+import common.ecommerce.shared.error.IdempotencyConflictException;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.spi.IdempotencyClaim;
+import common.ecommerce.shared.spi.IdempotencyRecord;
+import common.ecommerce.shared.spi.IdempotencyStatus;
+import common.ecommerce.shared.spi.IdempotencyStore;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/common/ecommerce/model/support/CanonicalKeysTest.java b/common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
similarity index 95%
rename from core/src/test/java/common/ecommerce/model/support/CanonicalKeysTest.java
rename to common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
index 82c1e21..57599de 100644
--- a/core/src/test/java/common/ecommerce/model/support/CanonicalKeysTest.java
+++ b/common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
@@ -1,7 +1,7 @@
-package common.ecommerce.model.support;
+package common.ecommerce.shared.support;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import org.junit.jupiter.api.Test;
diff --git a/core/pom.xml b/core/pom.xml
index d8af693..afb6438 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -11,10 +11,14 @@
common-ecommerce-core
- 领域模型、能力接口、门面、管道、SPI(无平台代码、无第三方运行时依赖)
+ 渠道域:领域模型、能力接口、门面、同步管道(无平台代码)
+ ecommerce
+ common-ecommerce-common
+
+
org.slf4j
slf4j-api
diff --git a/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java b/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java
index 19345b5..cae24ac 100644
--- a/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java
+++ b/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java
@@ -1,6 +1,6 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import java.util.EnumSet;
diff --git a/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java b/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java
index 76d360a..44c4563 100644
--- a/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java
@@ -1,11 +1,11 @@
package common.ecommerce.capability;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**
diff --git a/core/src/main/java/common/ecommerce/capability/AfterSales.java b/core/src/main/java/common/ecommerce/capability/AfterSales.java
index 32febf1..b4bfb25 100644
--- a/core/src/main/java/common/ecommerce/capability/AfterSales.java
+++ b/core/src/main/java/common/ecommerce/capability/AfterSales.java
@@ -1,12 +1,12 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
diff --git a/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java b/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java
index efc61a1..df80f28 100644
--- a/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java
@@ -1,8 +1,8 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.sdk.ChannelContext;
import java.util.List;
diff --git a/core/src/main/java/common/ecommerce/capability/CapabilityReport.java b/core/src/main/java/common/ecommerce/capability/CapabilityReport.java
index e394250..042fd27 100644
--- a/core/src/main/java/common/ecommerce/capability/CapabilityReport.java
+++ b/core/src/main/java/common/ecommerce/capability/CapabilityReport.java
@@ -1,6 +1,6 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import java.util.EnumSet;
diff --git a/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java b/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java
index 0740a86..1c1cacd 100644
--- a/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java
@@ -1,6 +1,6 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.sdk.ChannelContext;
diff --git a/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java b/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java
index bc2b3e1..d3f6409 100644
--- a/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java
@@ -2,7 +2,7 @@ package common.ecommerce.capability;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**
diff --git a/core/src/main/java/common/ecommerce/capability/Outbounds.java b/core/src/main/java/common/ecommerce/capability/Outbounds.java
index 61daa41..167ba97 100644
--- a/core/src/main/java/common/ecommerce/capability/Outbounds.java
+++ b/core/src/main/java/common/ecommerce/capability/Outbounds.java
@@ -1,9 +1,9 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.LabelQuery;
import common.ecommerce.model.fulfillment.OutboundOrder;
@@ -12,7 +12,7 @@ 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.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
diff --git a/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java b/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java
index 873e12f..aae7bfa 100644
--- a/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java
+++ b/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java
@@ -1,9 +1,9 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.util.EnumSet;
import java.util.Set;
diff --git a/core/src/main/java/common/ecommerce/capability/ProductCapable.java b/core/src/main/java/common/ecommerce/capability/ProductCapable.java
index dd63a98..ac6f7b2 100644
--- a/core/src/main/java/common/ecommerce/capability/ProductCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/ProductCapable.java
@@ -1,7 +1,7 @@
package common.ecommerce.capability;
-import common.ecommerce.model.Capability;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
diff --git a/core/src/main/java/common/ecommerce/capability/Products.java b/core/src/main/java/common/ecommerce/capability/Products.java
index a99e231..d5e0b46 100644
--- a/core/src/main/java/common/ecommerce/capability/Products.java
+++ b/core/src/main/java/common/ecommerce/capability/Products.java
@@ -1,10 +1,10 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
diff --git a/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java b/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java
index 18b9c20..1412ace 100644
--- a/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java
@@ -1,11 +1,11 @@
package common.ecommerce.capability;
-import common.ecommerce.error.ChannelException;
+import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.sdk.ChannelContext;
/**
diff --git a/core/src/main/java/common/ecommerce/capability/SalesOrders.java b/core/src/main/java/common/ecommerce/capability/SalesOrders.java
index 22d17ff..49a407a 100644
--- a/core/src/main/java/common/ecommerce/capability/SalesOrders.java
+++ b/core/src/main/java/common/ecommerce/capability/SalesOrders.java
@@ -1,16 +1,16 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
diff --git a/core/src/main/java/common/ecommerce/capability/SettlementCapable.java b/core/src/main/java/common/ecommerce/capability/SettlementCapable.java
index 3b5f2d6..1a5d032 100644
--- a/core/src/main/java/common/ecommerce/capability/SettlementCapable.java
+++ b/core/src/main/java/common/ecommerce/capability/SettlementCapable.java
@@ -2,7 +2,7 @@ package common.ecommerce.capability;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**
diff --git a/core/src/main/java/common/ecommerce/capability/Settlements.java b/core/src/main/java/common/ecommerce/capability/Settlements.java
index 80aedd3..5132ec8 100644
--- a/core/src/main/java/common/ecommerce/capability/Settlements.java
+++ b/core/src/main/java/common/ecommerce/capability/Settlements.java
@@ -1,12 +1,12 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
diff --git a/core/src/main/java/common/ecommerce/model/account/AccountKey.java b/core/src/main/java/common/ecommerce/model/account/AccountKey.java
index f66f628..de08c83 100644
--- a/core/src/main/java/common/ecommerce/model/account/AccountKey.java
+++ b/core/src/main/java/common/ecommerce/model/account/AccountKey.java
@@ -1,8 +1,8 @@
package common.ecommerce.model.account;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.model.support.CanonicalKeys;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.support.CanonicalKeys;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/model/account/ChannelAccount.java b/core/src/main/java/common/ecommerce/model/account/ChannelAccount.java
index 3a6e971..4a2caaa 100644
--- a/core/src/main/java/common/ecommerce/model/account/ChannelAccount.java
+++ b/core/src/main/java/common/ecommerce/model/account/ChannelAccount.java
@@ -1,7 +1,7 @@
package common.ecommerce.model.account;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java b/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java
index d42d862..0a3d62a 100644
--- a/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java
+++ b/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java
@@ -1,9 +1,9 @@
package common.ecommerce.model.aftersale;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java b/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java
index 170d312..554499d 100644
--- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java
+++ b/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java
@@ -1,8 +1,8 @@
package common.ecommerce.model.fulfillment;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java b/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java
index 0db96c8..cbce658 100644
--- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java
+++ b/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java
@@ -1,6 +1,6 @@
package common.ecommerce.model.fulfillment;
-import common.ecommerce.model.support.Money;
+import common.ecommerce.shared.support.Money;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java b/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
index 82a9a2c..76d3932 100644
--- a/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
+++ b/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
@@ -1,6 +1,6 @@
package common.ecommerce.model.fulfillment;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/model/order/OrderLine.java b/core/src/main/java/common/ecommerce/model/order/OrderLine.java
index 752ab1c..0ac34c5 100644
--- a/core/src/main/java/common/ecommerce/model/order/OrderLine.java
+++ b/core/src/main/java/common/ecommerce/model/order/OrderLine.java
@@ -1,6 +1,6 @@
package common.ecommerce.model.order;
-import common.ecommerce.model.support.Money;
+import common.ecommerce.shared.support.Money;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/model/order/SalesOrder.java b/core/src/main/java/common/ecommerce/model/order/SalesOrder.java
index edfbcd3..37d064c 100644
--- a/core/src/main/java/common/ecommerce/model/order/SalesOrder.java
+++ b/core/src/main/java/common/ecommerce/model/order/SalesOrder.java
@@ -1,8 +1,8 @@
package common.ecommerce.model.order;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/product/ProductListing.java b/core/src/main/java/common/ecommerce/model/product/ProductListing.java
index 03c16d1..fc814dc 100644
--- a/core/src/main/java/common/ecommerce/model/product/ProductListing.java
+++ b/core/src/main/java/common/ecommerce/model/product/ProductListing.java
@@ -1,9 +1,9 @@
package common.ecommerce.model.product;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java b/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java
index 88db768..2fc80e3 100644
--- a/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java
+++ b/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java
@@ -1,8 +1,8 @@
package common.ecommerce.model.settlement;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java b/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java
index e855f7e..c7f0aa2 100644
--- a/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java
+++ b/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java
@@ -2,8 +2,8 @@ package common.ecommerce.sdk;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.model.account.AccountKey;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import java.util.EnumSet;
diff --git a/core/src/main/java/common/ecommerce/sdk/CallSupport.java b/core/src/main/java/common/ecommerce/sdk/CallSupport.java
index b766cea..ad652e6 100644
--- a/core/src/main/java/common/ecommerce/sdk/CallSupport.java
+++ b/core/src/main/java/common/ecommerce/sdk/CallSupport.java
@@ -1,8 +1,8 @@
package common.ecommerce.sdk;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java b/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java
index beaef45..d39c79e 100644
--- a/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java
+++ b/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java
@@ -1,6 +1,6 @@
package common.ecommerce.sdk;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java b/core/src/main/java/common/ecommerce/sdk/ChannelContext.java
index 20d6e34..910f662 100644
--- a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java
+++ b/core/src/main/java/common/ecommerce/sdk/ChannelContext.java
@@ -2,9 +2,9 @@ package common.ecommerce.sdk;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.spi.ChannelSecret;
import java.time.Clock;
import java.util.Objects;
diff --git a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java b/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java
index 18c57e2..1baa685 100644
--- a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java
+++ b/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java
@@ -1,25 +1,25 @@
package common.ecommerce.sdk;
-import common.ecommerce.model.Platform;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.Slf4jCallObserver;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.capability.AdapterCapabilityReport;
import common.ecommerce.capability.AfterSales;
import common.ecommerce.capability.AggregatorCapable;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.capability.Products;
import common.ecommerce.capability.SalesOrders;
import common.ecommerce.capability.Outbounds;
import common.ecommerce.capability.Settlements;
-import common.ecommerce.idempotency.IdempotencyGuard;
+import common.ecommerce.shared.idempotency.IdempotencyGuard;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.spi.ChannelAccountRepository;
import common.ecommerce.sdk.AdapterFactory.AdapterConfig;
-import common.ecommerce.spi.IdempotencyStore;
+import common.ecommerce.shared.spi.IdempotencyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/common/ecommerce/spi/Sink.java b/core/src/main/java/common/ecommerce/spi/Sink.java
index 72348a3..0a6682b 100644
--- a/core/src/main/java/common/ecommerce/spi/Sink.java
+++ b/core/src/main/java/common/ecommerce/spi/Sink.java
@@ -1,6 +1,6 @@
package common.ecommerce.spi;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.order.SalesOrder;
diff --git a/core/src/main/java/common/ecommerce/sync/SyncEngine.java b/core/src/main/java/common/ecommerce/sync/SyncEngine.java
index 83bfcde..7c56610 100644
--- a/core/src/main/java/common/ecommerce/sync/SyncEngine.java
+++ b/core/src/main/java/common/ecommerce/sync/SyncEngine.java
@@ -1,10 +1,12 @@
package common.ecommerce.sync;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.sync.SyncResult;
+import common.ecommerce.shared.sync.SyncSpec;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.spi.Sink;
-import common.ecommerce.spi.SyncCursorStore;
+import common.ecommerce.shared.spi.SyncCursorStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java b/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java
index 3c7491e..b6b584b 100644
--- a/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java
+++ b/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java
@@ -1,12 +1,12 @@
package common.ecommerce.capability;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.model.Capability;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OrderEditRequest;
@@ -14,7 +14,7 @@ import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Clock;
diff --git a/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java b/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java
index 552516a..dda2f54 100644
--- a/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java
+++ b/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java
@@ -1,18 +1,18 @@
package common.ecommerce.sdk;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.product.ProductQuery;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Instant;
diff --git a/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java b/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java
index 2e5b744..09d1c60 100644
--- a/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java
+++ b/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java
@@ -2,14 +2,14 @@ package common.ecommerce.sdk;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.PlatformAdapter;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.idempotency.WriteResult;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.idempotency.WriteResult;
import common.ecommerce.model.account.AccountKey;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.sdk.ChannelContext;
@@ -37,7 +37,7 @@ class ChannelSdkTest {
/** 连接信息由调用方每次传入,测试里固定一份。 */
private static final ChannelConnection CONNECTION = ChannelConnection.of(
"https://api.example.com",
- common.ecommerce.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
+ common.ecommerce.shared.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
/** 假直连适配器:单平台,只有订单能力。 */
static final class FakeDirectAdapter implements common.ecommerce.capability.SalesOrderCapable {
@@ -197,42 +197,42 @@ class ChannelSdkTest {
@Test
void writesUseInjectedStore() {
// core 不能依赖 testkit,这里用最小本地替身验证门面装配
- common.ecommerce.spi.IdempotencyStore store =
- new common.ecommerce.spi.IdempotencyStore() {
- private final java.util.Map records =
- new java.util.LinkedHashMap();
+ common.ecommerce.shared.spi.IdempotencyStore store =
+ new common.ecommerce.shared.spi.IdempotencyStore() {
+ private final java.util.Map records =
+ new java.util.LinkedHashMap();
@Override
- public common.ecommerce.spi.IdempotencyClaim claim(String key, String owner,
+ public common.ecommerce.shared.spi.IdempotencyClaim claim(String key, String owner,
ChannelProvider provider, java.time.Instant now, long ttlSeconds) {
- common.ecommerce.spi.IdempotencyRecord existing = records.get(key);
- if (existing != null && existing.status() == common.ecommerce.spi.IdempotencyStatus.SUCCEEDED) {
- return common.ecommerce.spi.IdempotencyClaim.of(
- common.ecommerce.spi.IdempotencyClaim.Outcome.SUCCEEDED, existing);
+ common.ecommerce.shared.spi.IdempotencyRecord existing = records.get(key);
+ if (existing != null && existing.status() == common.ecommerce.shared.spi.IdempotencyStatus.SUCCEEDED) {
+ return common.ecommerce.shared.spi.IdempotencyClaim.of(
+ common.ecommerce.shared.spi.IdempotencyClaim.Outcome.SUCCEEDED, existing);
}
- records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
- common.ecommerce.spi.IdempotencyStatus.IN_PROGRESS, provider, owner, null, now));
- return common.ecommerce.spi.IdempotencyClaim.acquire();
+ records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
+ common.ecommerce.shared.spi.IdempotencyStatus.IN_PROGRESS, provider, owner, null, now));
+ return common.ecommerce.shared.spi.IdempotencyClaim.acquire();
}
@Override
public void complete(String key, String owner, String resultRef, java.time.Instant now) {
- common.ecommerce.spi.IdempotencyRecord current = records.get(key);
- records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
- common.ecommerce.spi.IdempotencyStatus.SUCCEEDED, current.provider(),
+ common.ecommerce.shared.spi.IdempotencyRecord current = records.get(key);
+ records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
+ common.ecommerce.shared.spi.IdempotencyStatus.SUCCEEDED, current.provider(),
owner, resultRef, now));
}
@Override
public void fail(String key, String owner, boolean retryable, java.time.Instant now) {
- common.ecommerce.spi.IdempotencyRecord current = records.get(key);
- records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
- common.ecommerce.spi.IdempotencyStatus.FAILED_RETRYABLE,
+ common.ecommerce.shared.spi.IdempotencyRecord current = records.get(key);
+ records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
+ common.ecommerce.shared.spi.IdempotencyStatus.FAILED_RETRYABLE,
current.provider(), owner, null, now));
}
@Override
- public java.util.Optional get(String key) {
+ public java.util.Optional get(String key) {
return java.util.Optional.ofNullable(records.get(key));
}
};
@@ -243,7 +243,7 @@ class ChannelSdkTest {
.register(new FakeDirectAdapter())
.build();
- common.ecommerce.idempotency.WriteScope scope = common.ecommerce.idempotency.WriteScope.of(
+ common.ecommerce.shared.idempotency.WriteScope scope = common.ecommerce.shared.idempotency.WriteScope.of(
ChannelProvider.DIRECT, Platform.WALMART_SC, "oms-wm-001", "wm-seller-01",
"markShipped", "PO-1:pkg-1");
assertEquals(WriteResult.Outcome.EXECUTED,
diff --git a/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java b/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java
index d0d7bfa..4d02d8a 100644
--- a/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java
+++ b/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java
@@ -1,19 +1,19 @@
package common.ecommerce.sdk;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
-import common.ecommerce.audit.Slf4jCallObserver;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
+import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.capability.CapabilityReport;
-import common.ecommerce.model.Capability;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Clock;
diff --git a/http/pom.xml b/http/pom.xml
index 1c40ee3..2fcce00 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -16,7 +16,7 @@
ecommerce
- common-ecommerce-core
+ common-ecommerce-common
com.squareup.okhttp3
diff --git a/http/src/main/java/common/ecommerce/http/OkHttpTransport.java b/http/src/main/java/common/ecommerce/http/OkHttpTransport.java
index fd262f5..f609530 100644
--- a/http/src/main/java/common/ecommerce/http/OkHttpTransport.java
+++ b/http/src/main/java/common/ecommerce/http/OkHttpTransport.java
@@ -1,6 +1,6 @@
package common.ecommerce.http;
-import common.ecommerce.error.TransientException;
+import common.ecommerce.shared.error.TransientException;
import java.util.concurrent.TimeUnit;
@@ -60,7 +60,7 @@ public final class OkHttpTransport implements HttpTransport {
return HttpResponse.of(resp.code(), headers, respBody, latency);
} catch (java.io.IOException e) {
throw TransientException.class.cast(new TransientException(
- common.ecommerce.error.ChannelException.builder()
+ common.ecommerce.shared.error.ChannelException.builder()
.message("http transport failed: " + e.getMessage())
.operation(request.operation())
.retryable(true), e));
diff --git a/http/src/main/java/common/ecommerce/http/Responses.java b/http/src/main/java/common/ecommerce/http/Responses.java
index a78711f..287178b 100644
--- a/http/src/main/java/common/ecommerce/http/Responses.java
+++ b/http/src/main/java/common/ecommerce/http/Responses.java
@@ -1,9 +1,9 @@
package common.ecommerce.http;
-import common.ecommerce.error.AuthException;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.RateLimitException;
-import common.ecommerce.error.TransientException;
+import common.ecommerce.shared.error.AuthException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.RateLimitException;
+import common.ecommerce.shared.error.TransientException;
/**
* 响应判定与重试分类。
@@ -40,7 +40,7 @@ public final class Responses {
if (response.isServerError()) {
throw new TransientException(b.retryable(true), null);
}
- throw new common.ecommerce.error.ValidationException(b);
+ throw new common.ecommerce.shared.error.ValidationException(b);
}
static long parseRetryAfterMillis(String raw) {
diff --git a/http/src/main/java/common/ecommerce/http/Signer.java b/http/src/main/java/common/ecommerce/http/Signer.java
index 87bc457..83f3f44 100644
--- a/http/src/main/java/common/ecommerce/http/Signer.java
+++ b/http/src/main/java/common/ecommerce/http/Signer.java
@@ -6,5 +6,5 @@ package common.ecommerce.http;
public interface Signer {
/** 在请求上补齐签名相关的 header / query。 */
- HttpRequest sign(HttpRequest request, common.ecommerce.spi.ChannelSecret secret);
+ HttpRequest sign(HttpRequest request, common.ecommerce.shared.spi.ChannelSecret secret);
}
diff --git a/http/src/main/java/common/ecommerce/http/TokenManager.java b/http/src/main/java/common/ecommerce/http/TokenManager.java
index d815517..c201498 100644
--- a/http/src/main/java/common/ecommerce/http/TokenManager.java
+++ b/http/src/main/java/common/ecommerce/http/TokenManager.java
@@ -1,9 +1,9 @@
package common.ecommerce.http;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
-import common.ecommerce.spi.LockProvider;
-import common.ecommerce.spi.TokenStore;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
+import common.ecommerce.shared.spi.LockProvider;
+import common.ecommerce.shared.spi.TokenStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -139,9 +139,9 @@ public abstract class TokenManager {
}
}
- private static common.ecommerce.error.AuthException authError(String message) {
- return new common.ecommerce.error.AuthException(
- common.ecommerce.error.ChannelException.builder()
+ private static common.ecommerce.shared.error.AuthException authError(String message) {
+ return new common.ecommerce.shared.error.AuthException(
+ common.ecommerce.shared.error.ChannelException.builder()
.message(message)
.operation("token.refresh"));
}
diff --git a/http/src/test/java/common/ecommerce/http/ResponsesTest.java b/http/src/test/java/common/ecommerce/http/ResponsesTest.java
index a05e02a..235a27b 100644
--- a/http/src/test/java/common/ecommerce/http/ResponsesTest.java
+++ b/http/src/test/java/common/ecommerce/http/ResponsesTest.java
@@ -14,14 +14,14 @@ class ResponsesTest {
@Test
void authMapsToAuthException() {
- assertThrows(common.ecommerce.error.AuthException.class,
+ assertThrows(common.ecommerce.shared.error.AuthException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(401, null, "{}", 1), "op"));
}
@Test
void rateLimitCarriesRetryAfter() {
- common.ecommerce.error.RateLimitException ex = assertThrows(
- common.ecommerce.error.RateLimitException.class,
+ common.ecommerce.shared.error.RateLimitException ex = assertThrows(
+ common.ecommerce.shared.error.RateLimitException.class,
() -> Responses.throwIfNotSuccess(
HttpResponse.of(429, java.util.Collections.singletonMap("Retry-After", "3"), "", 1), "op"));
assertEquals(3000L, ex.retryAfterMillis());
@@ -29,15 +29,15 @@ class ResponsesTest {
@Test
void serverErrorIsRetryable() {
- common.ecommerce.error.TransientException ex = assertThrows(
- common.ecommerce.error.TransientException.class,
+ common.ecommerce.shared.error.TransientException ex = assertThrows(
+ common.ecommerce.shared.error.TransientException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(503, null, "", 1), "op"));
assertEquals(true, ex.retryable());
}
@Test
void badRequestIsValidation() {
- assertThrows(common.ecommerce.error.ValidationException.class,
+ assertThrows(common.ecommerce.shared.error.ValidationException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(400, null, "", 1), "op"));
}
}
diff --git a/http/src/test/java/common/ecommerce/http/TokenManagerTest.java b/http/src/test/java/common/ecommerce/http/TokenManagerTest.java
index d33de5b..c134ae1 100644
--- a/http/src/test/java/common/ecommerce/http/TokenManagerTest.java
+++ b/http/src/test/java/common/ecommerce/http/TokenManagerTest.java
@@ -1,8 +1,8 @@
package common.ecommerce.http;
-import common.ecommerce.error.AuthException;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.error.AuthException;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -100,7 +100,7 @@ class TokenManagerTest {
TokenManager failing = new TokenManager(tokenStore, locks, clock, 600) {
@Override
protected AccessToken refresh(ChannelSecret secret, AccessToken previous) {
- throw new AuthException(common.ecommerce.error.ChannelException.builder()
+ throw new AuthException(common.ecommerce.shared.error.ChannelException.builder()
.message("app not exist").operation("token.refresh"));
}
};
@@ -153,7 +153,7 @@ class TokenManagerTest {
void advance(Duration d) { now = now.plus(d); }
}
- static final class LocalTokenStore implements common.ecommerce.spi.TokenStore {
+ static final class LocalTokenStore implements common.ecommerce.shared.spi.TokenStore {
private final java.util.Map tokens = new java.util.HashMap();
@Override public java.util.Optional get(String key) {
@@ -163,7 +163,7 @@ class TokenManagerTest {
@Override public void remove(String key) { tokens.remove(key); }
}
- static final class LocalLockProvider implements common.ecommerce.spi.LockProvider {
+ static final class LocalLockProvider implements common.ecommerce.shared.spi.LockProvider {
private final java.util.Set held = new java.util.HashSet();
private final java.util.Map counts = new java.util.HashMap();
diff --git a/lingxing/pom.xml b/lingxing/pom.xml
index 6e7de4a..7b6dd98 100644
--- a/lingxing/pom.xml
+++ b/lingxing/pom.xml
@@ -16,6 +16,10 @@
ecommerce
+ common-ecommerce-common
+
+
+ ecommerce
common-ecommerce-core
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
index 5c3420f..178373d 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
@@ -1,6 +1,6 @@
package common.ecommerce.lingxing;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星协议常量与 platform_code 映射。
*
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 3218216..cb952ad 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
@@ -10,8 +10,8 @@ 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.shared.error.AuthException;
+import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.http.HttpTransport;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.TokenManager;
@@ -33,9 +33,9 @@ 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;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
@@ -57,12 +57,12 @@ import common.ecommerce.model.product.ProductRef;
import common.ecommerce.model.product.ProductSyncStrategy;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
-import common.ecommerce.spi.LockProvider;
-import common.ecommerce.spi.TokenStore;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
+import common.ecommerce.shared.spi.LockProvider;
+import common.ecommerce.shared.spi.TokenStore;
import java.time.Clock;
import java.util.EnumSet;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
index 2034b12..0e26e01 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
@@ -2,11 +2,11 @@ package common.ecommerce.lingxing.adapter;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.capability.PlatformAdapter;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.sdk.AdapterFactory;
-import common.ecommerce.spi.LockProvider;
-import common.ecommerce.spi.TokenStore;
+import common.ecommerce.shared.spi.LockProvider;
+import common.ecommerce.shared.spi.TokenStore;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.time.Clock;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java b/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
index 53d39bf..3e5944f 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.auth;
-import common.ecommerce.error.AuthException;
-import common.ecommerce.error.ChannelException;
+import common.ecommerce.shared.error.AuthException;
+import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.HttpTransport;
@@ -9,7 +9,7 @@ import common.ecommerce.http.JsonCodec;
import common.ecommerce.http.Responses;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.LingxingConstants;
-import common.ecommerce.spi.AccessToken;
+import common.ecommerce.shared.spi.AccessToken;
import java.time.Clock;
import java.time.Instant;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java
index 12ca6ce..1367141 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java
@@ -9,7 +9,7 @@ import lombok.Setter;
* 领星订单的交易信息({@code data.list[].transaction_info[]})。
*
* 金额是带币种符号的字符串(如 {@code "¥49.16"}、{@code "-¥0.98"}),
- * 由 mapper 清洗后再转 {@link common.ecommerce.model.support.Money}。
+ * 由 mapper 清洗后再转 {@link common.ecommerce.shared.support.Money}。
*
* 币种约定:
*
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
index ef8680f..ac8e5b7 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
@@ -1,10 +1,10 @@
package common.ecommerce.lingxing.http;
import common.ecommerce.lingxing.LingxingConstants;
-import common.ecommerce.error.AuthException;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.error.RateLimitException;
+import common.ecommerce.shared.error.AuthException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.error.RateLimitException;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.Responses;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
index fb065d6..17b4cd5 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
@@ -3,8 +3,8 @@ package common.ecommerce.lingxing.http;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
index c8d02ff..e4c3405 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
@@ -1,6 +1,6 @@
package common.ecommerce.lingxing.http;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java b/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
index 7499fdf..b9ff416 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
@@ -5,11 +5,11 @@ import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto;
import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto;
import common.ecommerce.http.JacksonJsonCodec;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.ZoneId;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
index 55dde9a..9184d01 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
@@ -2,7 +2,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
/**
* 子平台的售后能力(只读)。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
index ab2489d..1258a3f 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
@@ -8,8 +8,8 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import java.util.Map;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
index 9334c98..5f53d67 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
@@ -2,7 +2,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.multiplatform.order.LingxingOrderFilters;
@@ -31,7 +31,7 @@ public interface LingxingOrderSource {
/** 单订单详情;没有详情接口的实现直接抛出即可。 */
default SalesOrder order(LingxingCall call, String channelOrderId) {
- throw new common.ecommerce.error.ChannelException.UnsupportedCapabilityException(
- common.ecommerce.model.Capability.SALES_ORDER);
+ throw new common.ecommerce.shared.error.ChannelException.UnsupportedCapabilityException(
+ common.ecommerce.shared.model.Capability.SALES_ORDER);
}
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
index 018bebb..eba4b24 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
@@ -2,7 +2,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
/**
* 子平台 / 账户的销售出库单能力。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java
index ea39b2f..09f0736 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java
@@ -3,7 +3,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
/**
* 子平台的商品 / Listing 能力。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java
index 092adbf..3d5e3f7 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java
@@ -3,7 +3,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
/**
* 子平台的结算 / 账单能力。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatform.java
index 8a9bb30..57a9a34 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatform.java
@@ -17,7 +17,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
public interface LingxingSubPlatform {
/** 对应的业务平台,用于注册表与日志。 */
- common.ecommerce.model.Platform platform();
+ common.ecommerce.shared.model.Platform platform();
/** 订单能力(领星标准订单接口);不支持时为 null。 */
default LingxingOrderSource orderSource() {
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java
index 370b782..5e629cf 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Platform;
import java.util.Collections;
import java.util.EnumMap;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java
index 5ba51d0..e46d400 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · AEPH 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java
index a389e2a..e3456a8 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java
@@ -10,7 +10,7 @@ import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.aftersale.AfterSaleType;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import java.time.ZoneId;
import java.util.ArrayList;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java
index 72eef10..9659dd9 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java
@@ -2,12 +2,12 @@ package common.ecommerce.lingxing.platform.aftersale;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleItemDto;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleType;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.PlatformTime;
import java.math.BigDecimal;
import java.time.Instant;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java
index 957692e..cedb4fc 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrder
import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOutboundSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · AliExpress 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java
index 369dcb3..1abadcc 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java
@@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.aliexpress.dto.AliexpressListingDto;
import common.ecommerce.lingxing.platform.LingxingProductSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java
index 280b4ee..7548aa6 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java
@@ -2,8 +2,8 @@ package common.ecommerce.lingxing.platform.amazon.order;
import com.fasterxml.jackson.databind.JsonNode;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -15,14 +15,14 @@ import common.ecommerce.lingxing.platform.amazon.sc.dto.FbmOrderDetailDto;
import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderDto;
import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderItemDto;
import common.ecommerce.lingxing.platform.LingxingOrderSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java
index 2b665d9..ff28384 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.amazon.order;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -14,14 +14,14 @@ import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderDetailItemDto
import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderDto;
import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderItemDto;
import common.ecommerce.lingxing.platform.LingxingOrderSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Duration;
import java.time.Instant;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java
index 9a4a4b4..2bf48d5 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java
@@ -16,7 +16,7 @@ import common.ecommerce.lingxing.platform.LingxingSettlementSource;
import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.amazon.sc.product.AmazonScProductSource;
import common.ecommerce.lingxing.platform.amazon.sc.shop.AmazonScShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · 亚马逊 SC 子平台:只做能力组合,不写业务逻辑。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java
index 8a510ca..5bfe0ea 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java
@@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonScListingDto;
import common.ecommerce.lingxing.platform.LingxingProductSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java
index 509f0c4..2236090 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java
@@ -8,7 +8,7 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonScShopDto;
import common.ecommerce.lingxing.platform.LingxingShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java
index 55567e2..af00fe2 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.amazon.settlement;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -11,13 +11,13 @@ import common.ecommerce.lingxing.mapper.LingxingOrderMapper;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonSettlementTransactionDto;
import common.ecommerce.lingxing.platform.LingxingSettlementSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java
index 21ffcba..64741de 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.amazon.vc.product.AmazonVcProductSource;
import common.ecommerce.lingxing.platform.amazon.vc.shop.VcShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · 亚马逊 VC 子平台:只做能力组合,不写业务逻辑。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/order/VcOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/order/VcOrderSource.java
index 4a16dc8..fd35fee 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/order/VcOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/order/VcOrderSource.java
@@ -2,8 +2,8 @@ package common.ecommerce.lingxing.platform.amazon.vc.order;
import com.fasterxml.jackson.databind.JsonNode;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -17,14 +17,14 @@ import common.ecommerce.lingxing.platform.amazon.vc.dto.VcOrderDto;
import common.ecommerce.lingxing.platform.amazon.vc.dto.VcOrderItemDto;
import common.ecommerce.lingxing.platform.amazon.vc.dto.VcOrderPoDetailDto;
import common.ecommerce.lingxing.platform.LingxingOrderSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
index 9100a35..a833d3d 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
@@ -7,12 +7,12 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.amazon.vc.dto.AmazonVcListingDto;
import common.ecommerce.lingxing.platform.LingxingProductSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDate;
@@ -215,12 +215,12 @@ public final class AmazonVcProductSource implements LingxingProductSource {
}
}
- private static common.ecommerce.model.support.Money moneyOrNull(String value, String currency) {
+ private static common.ecommerce.shared.support.Money moneyOrNull(String value, String currency) {
if (value == null || value.trim().isEmpty() || currency == null) {
return null;
}
try {
- return common.ecommerce.model.support.Money.of(value.trim(), currency);
+ return common.ecommerce.shared.support.Money.of(value.trim(), currency);
} catch (RuntimeException e) {
return null;
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java
index fc52f0c..180f781 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java
@@ -9,7 +9,7 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.amazon.vc.dto.VcShopDto;
import common.ecommerce.lingxing.platform.LingxingShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/bestbuy/BestbuySubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/bestbuy/BestbuySubPlatform.java
index 88e742c..709a8d9 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/bestbuy/BestbuySubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/bestbuy/BestbuySubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · BestBuy 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/custom/CustomSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/custom/CustomSubPlatform.java
index 382c48d..a1e44c6 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/custom/CustomSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/custom/CustomSubPlatform.java
@@ -9,7 +9,7 @@ import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOutboundSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · 自定义平台({@code platform_code=10009})子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/EbaySubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/EbaySubPlatform.java
index 96f3b4a..6c03b10 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/EbaySubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/EbaySubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrder
import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOutboundSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · eBay 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java
index 98a6b0e..7db7803 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java
@@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.ebay.dto.EbayListingDto;
import common.ecommerce.lingxing.platform.LingxingProductSource;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/echo/EchoSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/echo/EchoSubPlatform.java
index 32e2af3..4756001 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/echo/EchoSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/echo/EchoSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · ECHO 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/losdlius/LosDliUsSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/losdlius/LosDliUsSubPlatform.java
index 403b257..6d2a15e 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/losdlius/LosDliUsSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/losdlius/LosDliUsSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · LOS-DLI-US 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/michaels/MichaelsSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/michaels/MichaelsSubPlatform.java
index bb6b01b..00dceb0 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/michaels/MichaelsSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/michaels/MichaelsSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · Michaels 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/mirakl/MiraklSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/mirakl/MiraklSubPlatform.java
index 1b4cb47..a8d89a9 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/mirakl/MiraklSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/mirakl/MiraklSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · Mirakl 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java
index a441a3e..bfff93e 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.multiplatform.order;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.HttpTransport;
@@ -16,7 +16,7 @@ import common.ecommerce.lingxing.platform.LingxingOrderSource;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import java.time.Duration;
import java.time.Instant;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java
index 2480c6b..18242f2 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java
@@ -9,7 +9,7 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.multiplatform.dto.MultiPlatformShopDto;
import common.ecommerce.lingxing.platform.LingxingShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import java.util.ArrayList;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/SheinSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/SheinSubPlatform.java
index 4e6160b..06f8a4d 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/SheinSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/SheinSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOu
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.shein.product.SheinProductSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · SHEIN 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java
index 99cda0c..fd87ed9 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java
@@ -5,19 +5,19 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.lingxing.platform.shein.dto.SheinListingDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/TargetSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/TargetSubPlatform.java
index 103cbf2..7dd7e19 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/TargetSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/TargetSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrder
import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOutboundSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.target.product.TargetProductSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · Target 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java
index 521a6e2..efe605a 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java
@@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.lingxing.platform.target.dto.TargetListingDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/TemuSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/TemuSubPlatform.java
index 4101ed6..0718738 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/TemuSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/TemuSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOu
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.temu.product.TemuProductSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · Temu 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
index 662d793..0880ed6 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
@@ -5,18 +5,18 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.lingxing.platform.temu.dto.TemuListingDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import java.time.Instant;
import java.time.ZoneId;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/TiktokSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/TiktokSubPlatform.java
index f0e7808..7da031c 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/TiktokSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/TiktokSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOu
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.tiktok.product.TiktokProductSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · TikTok 子平台:只做能力组合。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSource.java
index 41b5e4f..041b340 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSource.java
@@ -5,19 +5,19 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.lingxing.platform.tiktok.dto.TiktokListingDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/WalmartSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/WalmartSubPlatform.java
index 05d2052..a81f264 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/WalmartSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/WalmartSubPlatform.java
@@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.walmart.order.WalmartOrderSource;
import common.ecommerce.lingxing.platform.walmart.product.WalmartProductSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · 沃尔玛子平台:只做能力组合,不写业务逻辑。
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
index 8de972d..0944d94 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
@@ -6,21 +6,21 @@ import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.lingxing.platform.walmart.dto.WalmartListingDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDate;
@@ -247,7 +247,7 @@ public final class WalmartProductSource implements LingxingProductSource {
return null;
}
- private static common.ecommerce.model.support.PlatformTime dateTime(String raw, ZoneId zone,
+ private static common.ecommerce.shared.support.PlatformTime dateTime(String raw, ZoneId zone,
boolean dateOnly) {
if (raw == null || raw.trim().isEmpty()) {
return null;
@@ -257,7 +257,7 @@ public final class WalmartProductSource implements LingxingProductSource {
Instant utc = dateOnly
? LocalDate.parse(value, DATE).atStartOfDay(zone).toInstant()
: LocalDateTime.parse(value, DATE_TIME).atZone(zone).toInstant();
- return common.ecommerce.model.support.PlatformTime.of(utc, zone);
+ return common.ecommerce.shared.support.PlatformTime.of(utc, zone);
} catch (RuntimeException e) {
return null;
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wayfair/WayfairSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wayfair/WayfairSubPlatform.java
index a4ec6e4..4a2b848 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wayfair/WayfairSubPlatform.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wayfair/WayfairSubPlatform.java
@@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
/**
* 领星 · Wayfair 子平台:只做能力组合。
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
index 295e4d9..13fd069 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/OrderEditSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/OrderEditSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.wms;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.Responses;
@@ -10,7 +10,7 @@ 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.shared.model.ChannelProvider;
import common.ecommerce.model.fulfillment.DeclaredItem;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/ShipmentReviewSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/ShipmentReviewSource.java
index 0fb8816..77f9c73 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/ShipmentReviewSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/ShipmentReviewSource.java
@@ -2,8 +2,8 @@ package common.ecommerce.lingxing.platform.wms;
import com.fasterxml.jackson.databind.JsonNode;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -13,7 +13,7 @@ import common.ecommerce.lingxing.platform.LingxingShipmentReviewSource;
import common.ecommerce.lingxing.platform.wms.dto.ShipmentReviewDataDto;
import common.ecommerce.lingxing.platform.wms.dto.ShipmentReviewFailureDto;
import common.ecommerce.lingxing.platform.wms.dto.ShipmentReviewSuccessDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import java.util.ArrayList;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsLabelSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsLabelSource.java
index 3b0eb10..b8f5b20 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsLabelSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsLabelSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.wms;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -10,7 +10,7 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.LingxingLabelSource;
import common.ecommerce.lingxing.platform.wms.dto.WmsLogisticsLabelDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.fulfillment.LabelQuery;
import common.ecommerce.model.fulfillment.ShippingLabel;
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsOutboundOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsOutboundOrderSource.java
index b4a6b82..bedad43 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsOutboundOrderSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/wms/WmsOutboundOrderSource.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.wms;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
@@ -13,14 +13,14 @@ import common.ecommerce.lingxing.platform.LingxingOutboundOrderSource;
import common.ecommerce.lingxing.platform.wms.dto.WmsOutboundOrderDto;
import common.ecommerce.lingxing.platform.wms.dto.WmsOutboundOrderItemDto;
import common.ecommerce.lingxing.platform.wms.dto.WmsSurfaceFileDto;
-import common.ecommerce.model.ChannelProvider;
+import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderLine;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
-import common.ecommerce.model.support.Money;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Money;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java
index eb79bf5..be408cf 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java
@@ -1,21 +1,21 @@
package common.ecommerce.lingxing.adapter;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
-import common.ecommerce.error.ChannelException;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
+import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.support.LingxingTestSupport;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelSdk;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.testkit.InMemoryAccounts;
import common.ecommerce.testkit.InMemoryLockProvider;
import common.ecommerce.testkit.InMemoryTokenStore;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java
index 0197d7b..c0b09c6 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java
@@ -8,8 +8,8 @@ import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.OkHttpTransport;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.lingxing.auth.LingxingTokenClient;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.LabelQuery;
@@ -25,11 +25,11 @@ import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.testkit.InMemoryLockProvider;
import common.ecommerce.testkit.InMemoryTokenStore;
import org.junit.jupiter.api.Test;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java
index 5c0edae..2767d11 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java
@@ -1,20 +1,20 @@
package common.ecommerce.lingxing.adapter;
-import common.ecommerce.audit.CallObserver;
-import common.ecommerce.audit.CallOutcome;
-import common.ecommerce.audit.CallRecord;
+import common.ecommerce.shared.audit.CallObserver;
+import common.ecommerce.shared.audit.CallOutcome;
+import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.support.LingxingTestSupport;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelSdk;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.testkit.InMemoryAccounts;
import common.ecommerce.testkit.InMemoryLockProvider;
import common.ecommerce.testkit.InMemoryTokenStore;
@@ -155,10 +155,10 @@ class LingxingSdkListingCallTest {
// Target 有商品能力;没有商品接口的长尾平台(如 Mirakl)没有
assertTrue(sdk(transport, account, CallObserver.NOOP)
- .capabilities(account.key()).supports(common.ecommerce.model.Capability.PRODUCT));
+ .capabilities(account.key()).supports(common.ecommerce.shared.model.Capability.PRODUCT));
ChannelAccount mirakl = LingxingTestSupport.account(Platform.MIRAKL, 10034, "store-1");
assertFalse(sdk(transport, mirakl, CallObserver.NOOP)
- .capabilities(mirakl.key()).supports(common.ecommerce.model.Capability.PRODUCT));
+ .capabilities(mirakl.key()).supports(common.ecommerce.shared.model.Capability.PRODUCT));
}
}
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java
index 7316fd5..befa624 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java
@@ -1,8 +1,8 @@
package common.ecommerce.lingxing.http;
-import common.ecommerce.error.AuthException;
-import common.ecommerce.error.PlatformBusinessException;
-import common.ecommerce.error.RateLimitException;
+import common.ecommerce.shared.error.AuthException;
+import common.ecommerce.shared.error.PlatformBusinessException;
+import common.ecommerce.shared.error.RateLimitException;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.JacksonJsonCodec;
import org.junit.jupiter.api.Test;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java
index 4eba270..9080577 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java
@@ -2,14 +2,14 @@ package common.ecommerce.lingxing.http;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.JacksonJsonCodec;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.net.URLEncoder;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSourceTest.java
index 9ab95cc..ee24753 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSourceTest.java
@@ -1,13 +1,13 @@
package common.ecommerce.lingxing.platform.aftersale;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.aftersale.AfterSaleType;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.testkit.JsonFixture;
import common.ecommerce.testkit.RecordingTransport;
import common.ecommerce.testkit.Responses;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapperTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapperTest.java
index 7fba987..008ee8f 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapperTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapperTest.java
@@ -2,8 +2,8 @@ package common.ecommerce.lingxing.platform.aftersale;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleType;
import org.junit.jupiter.api.Test;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSourceTest.java
index 0df02d3..2728d7c 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.aliexpress.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSourceTest.java
index d109bc3..01231cc 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.amazon.sc.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSourceTest.java
index b0ed2c8..8791c65 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.amazon.vc.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSourceTest.java
index c0953b0..428f388 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSourceTest.java
@@ -1,8 +1,8 @@
package common.ecommerce.lingxing.platform.ebay.product;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSourceTest.java
index 8239b5f..960593e 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.shein.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/target/product/TargetProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/target/product/TargetProductSourceTest.java
index a4b7fd6..7654dd8 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/target/product/TargetProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/target/product/TargetProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.target.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
@@ -77,7 +77,7 @@ class TargetProductSourceTest {
@Test
void localSkuSearchUnsupportedFailsLoudly() {
- assertThrows(common.ecommerce.error.ValidationException.class,
+ assertThrows(common.ecommerce.shared.error.ValidationException.class,
() -> new TargetProductSource().products(
call(transport, account(Platform.TARGET, 10017, "1106")),
ProductQuery.builder()
@@ -88,7 +88,7 @@ class TargetProductSourceTest {
@Test
void multiValueSearchUnsupportedFailsLoudly() {
- assertThrows(common.ecommerce.error.ValidationException.class,
+ assertThrows(common.ecommerce.shared.error.ValidationException.class,
() -> new TargetProductSource().products(
call(transport, account(Platform.TARGET, 10017, "1106")),
ProductQuery.builder()
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSourceTest.java
index 7488ffa..50bdbf2 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.temu.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSourceTest.java
index c0e0e99..2cc6d22 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/tiktok/product/TiktokProductSourceTest.java
@@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform.tiktok.product;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSourceTest.java
index 68a5720..ce291f9 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSourceTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSourceTest.java
@@ -1,13 +1,13 @@
package common.ecommerce.lingxing.platform.walmart.product;
-import common.ecommerce.error.ValidationException;
+import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.LingxingApi;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.testkit.JsonFixture;
import common.ecommerce.testkit.RecordingTransport;
import common.ecommerce.testkit.Responses;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java
index 1b2ec66..0438ad1 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java
@@ -12,14 +12,14 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.jupiter.api.Test;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java
index d2968a4..a204a1f 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java
@@ -8,18 +8,18 @@ import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.OkHttpTransport;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.lingxing.adapter.LingxingAdapter;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductSearchField;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.sdk.ChannelSdk;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.testkit.InMemoryAccounts;
import common.ecommerce.testkit.InMemoryLockProvider;
import common.ecommerce.testkit.InMemoryTokenStore;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java
index 956e52c..a2a6aff 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java
@@ -9,14 +9,14 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java
index def6211..9520383 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java
@@ -11,14 +11,14 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.lingxing.platform.LingxingCall;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java b/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java
index 5b4abde..30a9443 100644
--- a/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java
+++ b/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java
@@ -6,14 +6,14 @@ 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.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.testkit.RecordingTransport;
import java.time.Clock;
diff --git a/pom.xml b/pom.xml
index f27a175..d3005c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
+ common
core
http
testkit
@@ -36,6 +37,11 @@
ecommerce
+ common-ecommerce-common
+ ${project.version}
+
+
+ ecommerce
common-ecommerce-core
${project.version}
diff --git a/testkit/pom.xml b/testkit/pom.xml
index 51c7af2..26cab42 100644
--- a/testkit/pom.xml
+++ b/testkit/pom.xml
@@ -16,6 +16,10 @@
ecommerce
+ common-ecommerce-common
+
+
+ ecommerce
common-ecommerce-core
diff --git a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java
index 147cc48..9087871 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java
@@ -3,19 +3,19 @@ package common.ecommerce.testkit;
import common.ecommerce.capability.AfterSaleCapable;
import common.ecommerce.capability.ProductCapable;
import common.ecommerce.capability.SalesOrderCapable;
-import common.ecommerce.error.ChannelException;
+import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.model.account.AccountKey;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.aftersale.AfterSaleType;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Money;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Money;
import common.ecommerce.model.order.OrderLine;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.Platform;
-import common.ecommerce.model.support.PlatformTime;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.support.PlatformTime;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
@@ -26,7 +26,7 @@ import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import java.time.Instant;
import java.util.ArrayList;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java b/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java
index b9879f2..26673d0 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java
@@ -1,9 +1,9 @@
package common.ecommerce.testkit;
import common.ecommerce.spi.ChannelAccountRepository;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.spi.SecretProvider;
+import common.ecommerce.shared.spi.SecretProvider;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java b/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java
index f1c6815..d9f5dcd 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java
@@ -1,7 +1,7 @@
package common.ecommerce.testkit;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.spi.SyncCursorStore;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.spi.SyncCursorStore;
import java.time.Instant;
import java.util.HashMap;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java b/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java
index 0737f24..c10d289 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java
@@ -1,10 +1,10 @@
package common.ecommerce.testkit;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.spi.IdempotencyClaim;
-import common.ecommerce.spi.IdempotencyRecord;
-import common.ecommerce.spi.IdempotencyStatus;
-import common.ecommerce.spi.IdempotencyStore;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.spi.IdempotencyClaim;
+import common.ecommerce.shared.spi.IdempotencyRecord;
+import common.ecommerce.shared.spi.IdempotencyStatus;
+import common.ecommerce.shared.spi.IdempotencyStore;
import java.time.Duration;
import java.time.Instant;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java b/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java
index 9d05724..156dc19 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java
@@ -1,6 +1,6 @@
package common.ecommerce.testkit;
-import common.ecommerce.spi.LockProvider;
+import common.ecommerce.shared.spi.LockProvider;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java b/testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java
index 91fc505..73806c2 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java
@@ -1,6 +1,6 @@
package common.ecommerce.testkit;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.spi.Sink;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java b/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java
index 9b97224..5bb523c 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java
@@ -1,7 +1,7 @@
package common.ecommerce.testkit;
-import common.ecommerce.spi.AccessToken;
-import common.ecommerce.spi.TokenStore;
+import common.ecommerce.shared.spi.AccessToken;
+import common.ecommerce.shared.spi.TokenStore;
import java.util.HashMap;
import java.util.Map;
diff --git a/testkit/src/main/java/common/ecommerce/testkit/TestData.java b/testkit/src/main/java/common/ecommerce/testkit/TestData.java
index 155f773..e41bee0 100644
--- a/testkit/src/main/java/common/ecommerce/testkit/TestData.java
+++ b/testkit/src/main/java/common/ecommerce/testkit/TestData.java
@@ -1,8 +1,8 @@
package common.ecommerce.testkit;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.model.order.SalesOrder;
-import common.ecommerce.spi.SyncCursorStore;
+import common.ecommerce.shared.spi.SyncCursorStore;
import java.time.Duration;
import java.time.Instant;
@@ -22,7 +22,7 @@ public final class TestData {
}
/** 已推进过的水位线,避免测试里每次走全量。 */
- public static void seedWatermark(SyncCursorStore store, common.ecommerce.sync.SyncSpec spec, String iso) {
+ public static void seedWatermark(SyncCursorStore store, common.ecommerce.shared.sync.SyncSpec spec, String iso) {
store.advance(spec.provider(), spec.accountKey(), spec.stream(), Instant.parse(iso));
}
diff --git a/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java b/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java
index 699a450..5d408c2 100644
--- a/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java
+++ b/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java
@@ -1,11 +1,14 @@
package common.ecommerce.idempotency;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.error.CrossProviderConflictException;
-import common.ecommerce.error.IdempotencyConflictException;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
-import common.ecommerce.spi.IdempotencyStatus;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.error.CrossProviderConflictException;
+import common.ecommerce.shared.error.IdempotencyConflictException;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
+import common.ecommerce.shared.idempotency.IdempotencyGuard;
+import common.ecommerce.shared.idempotency.WriteResult;
+import common.ecommerce.shared.idempotency.WriteScope;
+import common.ecommerce.shared.spi.IdempotencyStatus;
import common.ecommerce.testkit.InMemoryIdempotencyStore;
import common.ecommerce.testkit.MutableClock;
import org.junit.jupiter.api.BeforeEach;
diff --git a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java b/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java
index 6073dc9..19704f9 100644
--- a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java
+++ b/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java
@@ -2,12 +2,12 @@ package common.ecommerce.testkit;
import common.ecommerce.capability.AdapterCapabilityReport;
import common.ecommerce.capability.CapabilityReport;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.support.Page;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.support.Page;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
@@ -15,8 +15,8 @@ import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.sync.SyncEngine;
-import common.ecommerce.sync.SyncResult;
-import common.ecommerce.sync.SyncSpec;
+import common.ecommerce.shared.sync.SyncResult;
+import common.ecommerce.shared.sync.SyncSpec;
import org.junit.jupiter.api.Test;
import java.time.Clock;
diff --git a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java b/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java
index ffdbcc8..72e1b67 100644
--- a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java
+++ b/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java
@@ -1,10 +1,10 @@
package common.ecommerce.testkit;
import common.ecommerce.capability.CapabilityReport;
-import common.ecommerce.error.ChannelException;
-import common.ecommerce.model.Capability;
-import common.ecommerce.model.ChannelProvider;
-import common.ecommerce.model.Platform;
+import common.ecommerce.shared.error.ChannelException;
+import common.ecommerce.shared.model.Capability;
+import common.ecommerce.shared.model.ChannelProvider;
+import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
@@ -15,10 +15,10 @@ import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
-import common.ecommerce.model.support.Page;
+import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelSdk;
-import common.ecommerce.spi.ChannelSecret;
+import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;