diff --git a/GUIDE.md b/GUIDE.md index d380f6e..f1da7cc 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -3,7 +3,7 @@ > 面向「要接入一个新平台」和「要写业务调用」的人。 > 读完之后你应该能回答三个问题:SDK 的分层是什么、加一个供应商要动哪些文件、加完之后怎么测。 > -> 配套材料:`README.md`(包职责与调用方式速查)、`D:\woker\文档\01需求分析\2026-10-28-电商平台\2026-10-26-cross-border-fulfillment-sdk-design.md`(Spec 0 总体设计)。 +> 配套材料:`README.md`(架构图、包结构与调用方式速查)、`D:\woker\文档\01需求分析\2026-10-28-电商平台\2026-10-26-cross-border-fulfillment-sdk-design.md`(Spec 0 总体设计)。 --- @@ -127,7 +127,7 @@ public interface PlatformAdapter { ### 3.2 能力接口 -供应商实现哪些接口,就声明哪些能力。目前有两个: +供应商实现哪些接口,就声明哪些能力。接口都继承 `PlatformAdapter`: ```java public interface SalesOrderCapable extends PlatformAdapter { @@ -143,11 +143,24 @@ public interface ProductCapable extends PlatformAdapter { } ``` +其余能力接口(按需实现,不实现就不声明): + +| 接口 | 读/写 | 关键方法 | +|:---|:---:|:---| +| `SettlementCapable` | 读 | `pull(ctx, SettlementQuery)` | +| `AfterSaleCapable` | 读 | `pull(ctx, AfterSaleQuery)` | +| `OutboundOrderCapable` | 读 | `pull(ctx, OutboundOrderQuery)` | +| `ShippingLabelCapable` | 读 | `labels(ctx, LabelQuery)` | +| `OutboundCapable` | **写** | `submit(ctx, packages)` / `results(ctx, globalOrderNos)` | +| `ShipmentReviewCapable` | **写** | `review(ctx, globalOrderNos)` | +| `OrderEditCapable` | **写** | `edit(ctx, requests)` | +| `AggregatorCapable` | — | `listSubChannels(ctx)`,聚合器额外实现 | + **为什么 `get` 的参数是 `SalesOrderRef` / `ProductRef` 而不是 `String`?** -Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现订单和商品的适配器(比如直连沃尔玛)**无法同时实现**,编译器直接报名称冲突。所以包成两个不同的类。 +Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现订单和商品的适配器(比如直连沃尔玛)**无法同时实现**,编译器直接报名称冲突。所以包成两个不同的类。对外的门面视图仍收 `String`(`sdk.salesOrders(key, conn).get("PO-123")`),由视图负责包装。 -> 对应的 import 路径:`common.ecommerce.model.order.SalesOrderRef`、`common.ecommerce.model.product.ProductRef`。`model` 包按职责拆成 `account` / `order` / `product` / `support` 四个子包,枚举留在 `model` 根包。 +> 对应的 import 路径:`common.ecommerce.channel.model.order.SalesOrderRef`、`common.ecommerce.channel.model.product.ProductRef`。`channel.model` 按职责拆成 `account` / `order` / `product` / `fulfillment` / `aftersale` / `settlement` 六个子包;枚举在 `common.ecommerce.shared.model` 根包。 **为什么 `pull` 返回 `Page` 而不是 `List`?** @@ -157,14 +170,20 @@ Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现 ```java public final class ChannelSdk implements ProviderResolver { - public CapabilityReport capabilities(AccountKey key); // 只读,不发请求 - public SalesOrders salesOrders(AccountKey key, ChannelConnection conn); // 订单视图 - public Products products(AccountKey key, ChannelConnection conn); // 商品视图 - public IdempotencyGuard writes(); // 写操作守卫 - public PlatformAdapter resolve(AccountKey key); // 按 key 找适配器 + public CapabilityReport capabilities(AccountKey key); // 只读,不发请求 + public SalesOrders salesOrders(AccountKey key, ChannelConnection conn); // 订单视图 + public Products products(AccountKey key, ChannelConnection conn); // 商品视图 + public Settlements settlements(AccountKey key, ChannelConnection conn); // 账单视图(读) + public AfterSales afterSales(AccountKey key, ChannelConnection conn); // 售后视图(读) + public Outbounds outbounds(AccountKey key, ChannelConnection conn); // 出库/面单/审核视图 + public List subChannels(AccountKey key, ChannelConnection conn); + public IdempotencyGuard writes(); // 写操作守卫 + public PlatformAdapter resolve(AccountKey key); // 按 key 找适配器 } ``` +写类能力(`submit` / `review` / `edit`)挂在 `Outbounds` 视图上,**仍必须经 `sdk.writes()` 包一层幂等**再调用。 + 门面**不做**:不选 provider、不自动兜底、不重试、不缓存。 每次调用固定三步: @@ -190,12 +209,13 @@ key → accountRepository.findByKey(provider, platform, omsStoreId) | SPI | 作用 | 读要用 | 写要用 | |:---|:---|:---:|:---:| -| `ChannelAccountRepository` | 读渠道账户 | ✅ | ✅ | +| `ChannelAccountRepository`(channel) | 读渠道账户 | ✅ | ✅ | +| `ChannelSecret` | 凭据载体,调用时经 `ChannelConnection` 传入 | ✅ | ✅ | | `SecretProvider` | ~~按 credentialRef 取密钥~~ **已废弃**:凭据由调用方传入 | — | — | | `TokenStore` | token 读写(宿主加密) | ✅ | ✅ | | `LockProvider` | token 刷新防击穿 | ✅ | ✅ | | `SyncCursorStore` | 水位线 | 批量读 | — | -| `Sink` | 领域对象落库 | 批量读 | — | +| `Sink`(channel) | 领域对象落库 | 批量读 | — | | `IdempotencyStore` | 幂等键抢占与结果 | — | ✅ | ### 3.5 错误类型 @@ -359,19 +379,19 @@ if (r.alreadyCompleted()) { ## 五、加一个供应商:8 步 -以新增 `acme` 直连平台为例。**核心原则:不改 core、不改门面、不改宿主。** +以新增 `acme` 直连平台为例。**核心原则:不改 channel、不改门面、不改宿主。** ### 第 0 步:先想清楚三件事 | 问题 | 影响 | |:---|:---| -| 它属于哪个 `Platform`? | 枚举里有直接用;没有才加(唯一允许改 core 的地方) | +| 它属于哪个 `Platform`? | 枚举里有直接用;没有才加(唯一允许改 `shared` 的地方) | | 走 `DIRECT` 还是新聚合器? | 新聚合器才加 `ChannelProvider` 枚举值 | | 它会哪些能力? | 只列真能做的 | -现有枚举: +现有枚举(`common.ecommerce.shared.model`): -- `Platform`:`AMAZON_SC` `AMAZON_VC` `WALMART_SC` `WALMART_1P` `TIKTOK` `TEMU` `EBAY` `SHEIN` `MIRAKL` `TARGET` `BESTBUY` `AEPH` `CUSTOM` +- `Platform`:`AMAZON_SC` `AMAZON_VC` `WALMART_SC` `WALMART_1P` `TIKTOK` `TEMU` `EBAY` `SHEIN` `ALIEXPRESS` `MIRAKL` `TARGET` `BESTBUY` `AEPH` `WAYFAIR` `MICHAELS` `ECHO` `LOSDLIUS` `CUSTOM` - `ChannelProvider`:`DIRECT` `LINGXING` `TEAPPLIX` `CUSTOM` ### 第 1 步:建模块 @@ -381,7 +401,11 @@ if (r.alreadyCompleted()) { ```xml ecommerce - common-ecommerce-core + common-ecommerce-shared + + + ecommerce + common-ecommerce-channel ecommerce @@ -406,17 +430,17 @@ if (r.alreadyCompleted()) { ```java package common.ecommerce.acme; -// model 包按职责分了子包,import 时注意: -import common.ecommerce.model.Capability; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.order.SalesOrderRef; -import common.ecommerce.model.support.Money; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; +// 枚举在 shared.model,渠道域模型在 channel.model +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.shared.support.Money; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; public final class AcmeConstants { @@ -456,7 +480,7 @@ public final class AcmeOrderDto { **平台字段名只允许出现在 DTO 和 Mapper 里。** **DTO 用 Lombok,领域模型不用。** DTO 是纯数据容器,没有不变量要保护,`@Getter`/`@Setter` -省掉全部样板;`core` 的模型是不可变 + Builder,本来就没有 setter,且 `core` 要尽量少依赖 +省掉全部样板;`channel` 的模型是不可变 + Builder,本来就没有 setter,且 `channel` 要尽量少依赖 编译期工具。Lombok 声明为 `scope=provided`,不进宿主运行时。 **端点和路径写成常量,不做配置。** 协议细节(URL、字段名、限流值)是代码的一部分—— @@ -560,27 +584,23 @@ public final class AcmeSigner { ```java public final class AcmeAdapter implements SalesOrderCapable { - private final String baseUrl; private final HttpTransport transport; private final JacksonJsonCodec json; - private final SecretProvider secretProvider; private final Clock clock; private final TokenManager tokenManager; private final AcmeOrderMapper mapper = new AcmeOrderMapper(); - public AcmeAdapter(String baseUrl, HttpTransport transport, JacksonJsonCodec json, - SecretProvider secretProvider, TokenStore tokenStore, - LockProvider lockProvider, Clock clock) { - this.baseUrl = baseUrl; + // 适配器只持有协议与基础设施:端点与凭据随每次调用的 ChannelContext 进来 + public AcmeAdapter(HttpTransport transport, JacksonJsonCodec json, + TokenStore tokenStore, LockProvider lockProvider, Clock clock) { this.transport = transport; this.json = json; - this.secretProvider = secretProvider; this.clock = clock; - final AcmeTokenClient tokenClient = new AcmeTokenClient(transport, json, baseUrl); + final AcmeTokenClient tokenClient = new AcmeTokenClient(transport, json, clock); this.tokenManager = new TokenManager(tokenStore, lockProvider, clock, 600) { @Override protected AccessToken refresh(ChannelSecret secret, AccessToken previous) { - return tokenClient.fetch(secret.appKey(), secret.appSecret()); + return tokenClient.fetch(secret.endpointBaseUrl(), secret.appKey(), secret.appSecret()); } }; } @@ -604,7 +624,7 @@ public final class AcmeAdapter implements SalesOrderCapable { HttpRequest req = HttpRequest.builder() .method("POST") - .url(baseUrl + AcmeConstants.PATH_ORDERS) + .url(ctx.endpointBaseUrl() + AcmeConstants.PATH_ORDERS) // ★ 端点来自 ctx .header("Content-Type", "application/json") .header("Authorization", authHeader(ctx)) .header("X-Request-Id", ctx.requestId()) @@ -641,8 +661,8 @@ public final class AcmeAdapter implements SalesOrderCapable { private String authHeader(ChannelContext ctx) { ChannelAccount account = ctx.account(); - ChannelSecret secret = secretProvider.get(account.credentialRef()); - AccessToken token = tokenManager.getOrRefresh("acme:" + account.externalStoreId(), secret); + // 凭据由调用方经 ChannelConnection 传入,适配器不自己去找 + AccessToken token = tokenManager.getOrRefresh("acme:" + account.externalStoreId(), ctx.secret()); return token.tokenType() + " " + token.value(); } @@ -673,13 +693,11 @@ public final class AcmeAdapter implements SalesOrderCapable { ```java public final class AcmeAdapterFactory implements AdapterFactory { - private final SecretProvider secretProvider; private final TokenStore tokenStore; private final LockProvider lockProvider; private final Clock clock; - public AcmeAdapterFactory(SecretProvider secretProvider, TokenStore tokenStore, - LockProvider lockProvider, Clock clock) { ... } + public AcmeAdapterFactory(TokenStore tokenStore, LockProvider lockProvider, Clock clock) { ... } @Override public String adapterId() { return AcmeConstants.ADAPTER_ID; } @Override public ChannelProvider provider() { return ChannelProvider.DIRECT; } @@ -687,17 +705,15 @@ public final class AcmeAdapterFactory implements AdapterFactory { @Override public PlatformAdapter create(AdapterConfig config) { - String baseUrl = config.endpointBaseUrl() == null - ? AcmeConstants.DEFAULT_BASE_URL : config.endpointBaseUrl(); - return new AcmeAdapter(baseUrl, - new OkHttpTransport("common-ecommerce/1.0.0 (acme)"), - new JacksonJsonCodec(), - secretProvider, tokenStore, lockProvider, clock); + // 生产端点由调用方的 ChannelConnection 提供;config 只用于测试/联调时覆盖目标地址 + return new AcmeAdapter(new OkHttpTransport("common-ecommerce/1.0.0 (acme)"), + new JacksonJsonCodec(), tokenStore, lockProvider, clock); } } ``` 工厂的意义:把「怎么 new」和「业务怎么用」隔开。宿主只注册工厂,不需要知道构造参数。 +**工厂不持有凭据**——凭据随每次调用的 `ChannelConnection` 进来。 ### 第 8 步:接进门面 @@ -706,7 +722,7 @@ ChannelSdk sdk = ChannelSdk.builder() .accountRepository(accountRepo) .idempotencyStore(idempotencyStore) // 要写操作就必须 .idempotencyOwner(hostName) // 多实例时区分抢占方 - .register(new AcmeAdapterFactory(secretProvider, tokenStore, lockProvider, clock)) + .register(new AcmeAdapterFactory(tokenStore, lockProvider, clock)) .build(); AccountKey key = AccountKey.of(ChannelProvider.DIRECT, Platform.AMAZON_SC, "oms-amz-001"); @@ -770,24 +786,49 @@ assertEquals(md5Hex("secretapp_keyk1"), AcmeSigner.sign(params, "secret")); 时间相关的用 DST 边界:2026-03-08 美国太平洋时区进入夏令时,前后各测一次。 -### 第 2 层:真实环境冒烟(主力) +### 第 2 层:契约测试(主力) + +用 `RecordingTransport` + 夹具断言「请求怎么拼、响应怎么解」,**不联网**: + +```java +RecordingTransport transport = new RecordingTransport() + .tokenResponse("{\"data\":{\"access_token\":\"t-1\",\"expires_in\":7200}}") + .route("/v1/orders", "POST", + r -> Responses.ok(JsonFixture.load("fixtures/acme/orderList/success.json"))); -当前只保留真实环境冒烟(`LingxingLiveSmokeTest`),不再使用录制报文。 +AcmeAdapter adapter = new AcmeAdapter(transport, json, new InMemoryTokenStore(), locks, fixedClock); +ChannelContext ctx = ChannelContext.of(account, connection, "req-1", fixedClock); -做法:在测试类顶部写常量(本地联调时填真实值,不提交),用真实的 -`OkHttpTransport` 直接打平台接口;未填常量时用 `Assumptions` 跳过, -避免占位串打到线上。 +Page page = adapter.pull(ctx, query); + +HttpRequest last = transport.lastRequest(); +assertTrue(last.body().contains("\"updated_after\"")); +assertEquals("ACME-1001", page.items().get(0).channelOrderId()); +``` + +夹具按 `src/test/resources/fixtures/{platform}/{operation}/{case}.json` 存放,每个平台至少「正常 + 异常」两套。 +真实报文跑通后存成新夹具,以后改代码不用再连真实环境。 + +### 第 3 层:真实环境冒烟(手动,不进 CI) + +做法:凭据用**系统属性**传入(不要写成常量提交),未提供时用 `Assumptions` 跳过: + +```bash +mvn -pl lingxing -am test -Dtest=AcmeLiveSmokeTest \ + -Dacme.probe.appKey=xxx -Dacme.probe.appSecret=yyy +``` ```java class AcmeLiveSmokeTest { - private static final String APP_KEY = "在这里填 AppID"; - private static final String APP_SECRET = "在这里填 AppSecret"; + private static final String APP_KEY = System.getProperty("acme.probe.appKey", ""); + private static final String APP_SECRET = System.getProperty("acme.probe.appSecret", ""); private final HttpTransport transport = new OkHttpTransport("common-ecommerce-smoke"); @Test void tokenCanBeFetched() { + Assumptions.assumeTrue(!APP_KEY.isEmpty() && !APP_SECRET.isEmpty(), "未提供凭据,跳过"); AccessToken token = new AcmeTokenClient(transport, json, Clock.systemUTC()) .fetch(BASE_URL, APP_KEY, APP_SECRET); assertNotNull(token.value()); @@ -796,9 +837,11 @@ class AcmeLiveSmokeTest { ``` 联调时把请求和响应打出来(token 打码),签名或字段名不对时靠日志定位。 -**凭证不要提交到仓库**,联调完重置。 +**凭证不要提交到仓库**(提交历史里的密钥要轮换),联调完重置。 -### 第 3 层:分页与水位线 +> 领星尤其注意:真实环境**只跑查询类接口**。出库、审核发货这类写接口没有测试环境,误操作不可回滚。 + +### 第 4 层:分页与水位线 ```java @Test @@ -836,7 +879,7 @@ void pagesThroughAllOrdersAndAdvancesWatermarkOnce() { - 返回空页 → 立刻结束,不无限循环 - 没有水位线 → 抛 `IllegalStateException` -### 第 4 层:门面 + 能力 +### 第 5 层:门面 + 能力 ```java @Test @@ -855,33 +898,6 @@ void facadeRejectsUnsupportedCapability() { 聚合器还要额外测:同一适配器,Walmart 账户和 eBay 账户的 `supports` 结果不同。 -### 第 5 层:真实冒烟(手动,不进 CI) - -参考 `lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java`:没配环境变量时整类跳过。 - -```java -@EnabledIfEnvironmentVariable(named = "ACME_APP_KEY", matches = ".+") -class AcmeLiveSmokeTest { - - @Test - void tokenCanBeFetched() { ... } // 先验认证 - - @Test - void pullsOnePage() { ... } // 再验报文 -} -``` - -包一层 `LoggingTransport` 打印请求响应(Authorization 打码、body 截断)。 - -**排错顺序**: - -1. 401 / 403 → 先单独跑 token 测试;还失败就查出口 IP 白名单。 -2. token 通了但接口报签名错 → 只改 `Signer`,跑已知向量。 -3. 200 但 0 条 → 查时间窗、`platform_code`、`store_id` 是否属于同一店铺。 -4. 200 有数据但字段 null → 对照原始报文改 DTO 的 `@JsonProperty`,然后把真实响应存成新夹具。 - -**真实报文转夹具**:冒烟跑通后,把打印的响应存成 `fixtures/acme/orderList/real-2026-10-29.json`,加一个 Mapper 用例。以后改代码不用再连真实环境。 - --- ## 七、验收清单 @@ -899,20 +915,21 @@ class AcmeLiveSmokeTest { | 7 | 超长时间窗会截断 | 断言 body 里的起止时间 | | 8 | 写操作只执行一次 | `adapter.writeCallCount() == 1` | | 9 | 水位线失败不推进 | 第二页抛异常后断言水位线不变 | -| 10 | core 零改动 | `git diff core/` 应只有 `Platform` 枚举 | +| 10 | channel / shared 零改动 | `git diff channel/ shared/` 应只有 `shared/model/Platform` 枚举 | --- ## 八、已知缺口与坑 -### 当前实现状态(2026-10-29) +### 当前实现状态(2026-11-06) | 模块 | 状态 | |:---|:---| -| core | 模型、能力接口、门面、SyncEngine、幂等守卫、SPI 全部可用 | +| shared | 枚举、异常、SPI 契约、幂等守卫、审计、水位线通用类型全部可用 | +| channel | 领域模型、能力接口、门面、SyncEngine、账户/落库 SPI 全部可用 | | http | OkHttp 传输、Jackson 编解码、签名接口、TokenManager 模板可用 | | testkit | InMemory SPI、FakeDirectAdapter、MutableClock 可用 | -| lingxing | 订单列表拉取可用;商品、履约、面单、账单、售后未实现 | +| lingxing | 16 个子平台:订单 / 店铺全量;商品 8 个平台;结算、售后目前只有亚马逊 SC;出库单 / 面单 / 审核发货 / 订单编辑为 ERP 级、全平台共用 | | 其它平台 | 未开始 | ### 编码坑(按踩到概率排序) @@ -936,7 +953,7 @@ class AcmeLiveSmokeTest { | `RefundLedger` 未实现 | 无超退校验 | 与 `IdempotencyGuard` 配合 | | `DuplicateOrderGuard` 未实现 | 跨 provider 重复订单无告警 | 新增 SPI | | 领星时间窗超 31 天被静默截断 | 水位线落后太多会漏中间段 | 调用方分段补拉 | -| 领星单订单详情未实现 | `get()` 直接抛异常 | 用 `pull` + 时间窗捞 | +| 领星单订单详情未实现 | 除亚马逊 SC / VC 外的子平台 `get()` 直接抛异常 | 用 `pull` + 时间窗捞 | | 领星限流器用 `Thread.sleep` | 多店并发时按实例数放大 | 按账户拆适配器实例,或换通用限流器 | --- @@ -944,7 +961,7 @@ class AcmeLiveSmokeTest { ## 九、上手顺序 1. **读三个文件**:`PlatformAdapter`、`SalesOrderCapable`、`ChannelSdk`。不到 150 行,看懂这三个就懂一半。 -2. **跑一遍现有测试**:`mvn -pl lingxing -am test`,对照看 `LingxingAdapterTest` —— 它就是「加一个供应商」的完整范例。 +2. **跑一遍现有测试**:`mvn -pl lingxing -am test`,对照看 `LingxingSdkListingCallTest`(门面 + 契约)与 `LingxingAfterSaleListSourceTest`(Source + 夹具)—— 它们就是「加一个供应商」的完整范例。 3. **抄领星的结构**建新模块:`Constants → Dto → Mapper → Adapter → Factory → Test`。 4. **先用夹具跑通,再连真实环境。** 不要反过来。 @@ -953,6 +970,6 @@ class AcmeLiveSmokeTest { ```bash mvn clean test # 全部 mvn -pl lingxing -am test # 单模块(含依赖) -mvn -pl lingxing -am test -Dtest=LingxingAdapterTest # 单个测试类 +mvn -pl lingxing -am test -Dtest=LingxingSdkListingCallTest # 单个测试类 mvn -pl lingxing -am test -Dtest=LingxingLiveSmokeTest # 真实环境冒烟(需环境变量) ``` diff --git a/README.md b/README.md index 2fa5895..69fa6c7 100644 --- a/README.md +++ b/README.md @@ -7,25 +7,124 @@ 纯 SDK 库,嵌入宿主(OMS)进程运行。**不访问数据库、不访问 Redis、不访问 MQ、不私起线程或定时器**。所有外部副作用通过 SPI 注入,由宿主实现。 ``` -① 统一入口 ChannelSdk / 各能力门面 -② 能力接口 ProductCapable / SalesOrderCapable / FulfillmentCapable / ... -③ 平台适配 amazon-sc / walmart-sc / tiktok / temu / lingxing / ... -④ 基础设施 HttpTransport / Signer / TokenManager / RateLimiter / SyncEngine / Idempotency +① 统一入口 ChannelSdk / 各能力视图(SalesOrders / Products / Outbounds / AfterSales / Settlements) +② 能力接口 ProductCapable / SalesOrderCapable / ShippingLabelCapable / AfterSaleCapable / ... +③ 平台适配 lingxing(聚合:amazon-sc / walmart / tiktok / temu / ebay / shein / target …) +④ 基础设施 HttpTransport / Signer / TokenManager / LingxingRateLimiter / SyncEngine / Idempotency ⑤ 宿主 SPI AccountRepository / TokenStore / SyncCursorStore / Sink / Clock / LockProvider / ... ``` +## 架构图 + +**分层与依赖**:业务只依赖 `channel` 的门面与模型;平台协议全部关在适配器里; +`shared` 被所有模块共享,但不反向依赖任何领域模块。 + +```mermaid +graph TD + subgraph HOST["宿主进程(OMS)"] + BIZ["业务代码"] + IMPL["宿主 SPI 实现
MySQL · Redis/Redisson · KMS"] + end + + subgraph SDK["common-ecommerce"] + FACADE["channel · 门面
ChannelSdk · 能力视图
SalesOrders / Products / Outbounds / AfterSales / Settlements"] + CAP["channel · 能力接口
PlatformAdapter · SalesOrderCapable · ProductCapable …"] + CMODEL["channel · 领域模型
SalesOrder · ProductListing · AccountKey · Page"] + ENGINE["channel · 同步管道
SyncEngine"] + SHARED["shared · 跨域共享层
异常 · 幂等 · 审计 · 枚举 · SPI 定义 · Money/Page"] + HTTPM["http · 出入网层
HttpTransport · Signer · TokenManager · JsonCodec"] + LX["lingxing · 聚合适配器
LingxingAdapter → LingxingSubPlatforms → 子平台 Source"] + end + + EXT["领星开放平台 / 各电商平台"] + + BIZ --> FACADE + FACADE --> CAP + FACADE --> CMODEL + FACADE --> ENGINE + FACADE --> SHARED + CAP --> CMODEL + ENGINE --> SHARED + LX -. 实现能力接口 .-> CAP + LX --> CMODEL + LX --> HTTPM + LX --> SHARED + HTTPM --> SHARED + IMPL -. 实现 SPI .-> SHARED + HTTPM --> EXT +``` + +**模块依赖**(与各模块 `pom.xml` 一致,箭头指向被依赖方): + +```mermaid +graph BT + shared["shared
common-ecommerce-shared"] + channel["channel
common-ecommerce-channel"] + http["http
common-ecommerce-http"] + testkit["testkit
common-ecommerce-testkit"] + lingxing["lingxing
common-ecommerce-lingxing"] + + channel --> shared + http --> shared + testkit --> shared + testkit --> channel + testkit --> http + lingxing --> shared + lingxing --> channel + lingxing --> http +``` + +**一次商品查询的调用链**(订单、售后、出库等能力走同一条骨架): + +```mermaid +sequenceDiagram + participant Host as 宿主业务 + participant SDK as ChannelSdk + participant Repo as ChannelAccountRepository + participant Ad as LingxingAdapter + participant Sub as 子平台 Source + participant Call as LingxingCall + participant HTTP as HttpTransport + + Host->>SDK: products(key, connection).pull(query) + SDK->>Repo: findByKey(AccountKey) + Repo-->>SDK: ChannelAccount + SDK->>SDK: 能力检查 supports(account, PRODUCT) + SDK->>Ad: newContext(account, connection) + Ad->>Ad: tokenManager 取 token(缓存 / 续期 / 防击穿) + Ad->>Sub: 按 account.platform 分派 Source + Sub->>Call: signed(api, body, operation) + Call->>Call: 限流 + 签名 + 公共参数 + Call->>HTTP: POST + HTTP-->>Call: 原始响应 + Call-->>Sub: 校验信封 code / msg + Sub-->>Ad: 统一模型 Page + Ad-->>SDK: Page + SDK-->>Host: Page +``` + ## 模块 | 模块 | 职责 | |:---|:---| -| `common-ecommerce-core` | 领域模型、能力接口、门面、管道、SPI。**零第三方运行时依赖** | -| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码 | +| `common-ecommerce-shared` | **跨域共享层**:异常体系、SPI 契约、幂等、审计、水位线、通用值对象(Money / Page / PlatformTime / 枚举)。不依赖任何领域模块 | +| `common-ecommerce-channel` | 渠道域:领域模型、能力接口、门面、同步管道。依赖 `shared` | +| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码。依赖 `shared`,**不依赖 `channel`** | | `common-ecommerce-testkit` | InMemory SPI 与测试替身 | | `common-ecommerce-lingxing` | 领星聚合适配器(多子平台)。DTO 用 Lombok 生成访问器 | +依赖方向: +``` +channel ─┐ +http ────┼──→ shared +testkit ─┘ +lingxing ──→ channel, http, shared +``` +渠道域与未来的仓库域平级,互不依赖,只共享 `shared`。`http` 不依赖 `channel`,仓库域可以直接复用传输层与令牌管理。 + **Lombok 使用范围**:仅 `lingxing` 模块的 `dto/*`,`scope=provided`,不进宿主运行时。 -`core` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限, -而 `core` 要尽量少依赖编译期工具。 +`channel` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限, +而 `channel` 要尽量少依赖编译期工具。 ## 构建 @@ -40,29 +139,149 @@ mvn clean test --- -## 一、包职责 +## 一、包结构 + +按当前代码实际目录生成(`src/main/java`,测试包与主代码同构)。模块名在注释里标出。 ``` common.ecommerce -├── model 领域模型(core) -│ ├── account AccountKey / ChannelAccount -│ ├── order SalesOrder / OrderLine / Query / Ref -│ ├── product ProductListing / Query / Ref / SyncStrategy -│ └── support Money / PlatformTime / Page / CanonicalKeys -├── capability 能力接口,适配器实现这些(core) -├── error 统一异常体系(core) -├── sdk 门面、上下文、适配器工厂接口(core) -├── sync 增量同步引擎与水位线计算(core) -├── idempotency 写操作双锁幂等守卫(core) -├── spi 宿主必须实现的扩展点(core) -├── http HTTP 传输、JSON、签名、令牌(http) -├── testkit 测试替身与夹具(testkit) -└── lingxing 领星适配器(lingxing) +│ +├── shared 跨域共享层(shared) +│ ├── model Platform / ChannelProvider / Capability / FulfillmentMode +│ ├── error ChannelException + Auth / RateLimit / Transient / Validation / +│ │ PlatformBusiness / IdempotencyConflict / CrossProviderConflict +│ ├── spi AccessToken / ChannelSecret / TokenStore / LockProvider / +│ │ IdempotencyStore(+Claim/Record/Status) / SyncCursorStore / +│ │ SecretProvider(已废弃) +│ ├── idempotency IdempotencyGuard / WriteScope / WriteResult / WriteAudit +│ ├── audit CallObserver / CallRecord / CallOutcome / Slf4jCallObserver +│ ├── sync SyncSpec / SyncResult +│ ├── support Money / PlatformTime / Page / CanonicalKeys +│ └── testkit 测试替身(testkit 模块): +│ FakeDirectAdapter / InMemory*(Accounts·Token·Cursor·Sink· +│ Lock·Idempotency) / RecordingTransport / Responses / +│ JsonFixture / MutableClock / TestData +│ +├── channel 渠道域(channel) +│ ├── model +│ │ ├── account AccountKey / ChannelAccount +│ │ ├── order SalesOrder / OrderLine / SalesOrderQuery / SalesOrderRef +│ │ ├── product ProductListing / ProductQuery / ProductRef / +│ │ │ ProductSearchField / ProductStatus / ProductSyncStrategy +│ │ ├── fulfillment DeclaredItem / LabelQuery / OrderEditRequest / OrderEditResult / +│ │ │ OutboundOrder / OutboundOrderLine / OutboundOrderQuery / +│ │ │ OutboundPackage / OutboundResult / ShipmentReviewResult / +│ │ │ ShippingLabel +│ │ ├── aftersale AfterSale / AfterSaleQuery / AfterSaleType +│ │ └── settlement SettlementQuery / SettlementTransaction +│ ├── capability PlatformAdapter / AggregatorCapable / CapabilityReport / +│ │ AdapterCapabilityReport / +│ │ SalesOrderCapable / ProductCapable / SettlementCapable / +│ │ AfterSaleCapable / OutboundCapable / OutboundOrderCapable / +│ │ ShippingLabelCapable / ShipmentReviewCapable / OrderEditCapable / +│ │ 门面视图:SalesOrders / Products / Settlements / AfterSales / Outbounds +│ ├── sdk ChannelSdk / ChannelContext / ChannelConnection / +│ │ AdapterFactory / ProviderResolver / CallSupport +│ ├── spi ChannelAccountRepository / Sink +│ └── sync SyncEngine +│ +├── http HTTP 与令牌(http) +│ HttpTransport / OkHttpTransport / HttpRequest / HttpResponse / +│ JsonCodec / JacksonJsonCodec / Signer / TokenManager / Responses +│ +└── lingxing 领星聚合适配器(lingxing) + ├── LingxingApi 接口定义(路径 + 限流参数) + ├── LingxingConstants 端点、分页/时间窗限制、platform_code → Platform + ├── adapter LingxingAdapter / LingxingAdapterFactory + ├── auth LingxingTokenClient + ├── http LingxingSigner / LingxingRequestFactory / LingxingRateLimiter / + │ LingxingEnvelope + ├── mapper LingxingOrderMapper + ├── dto 订单报文:LingxingOrderDto / OrderItem / OrderTag / LogisticsInfo / + │ PlatformInfo / SubProduct / TransactionInfo + └── platform + ├── LingxingSubPlatform / LingxingSubPlatforms / LingxingSubPlatformDefaults + ├── LingxingCall 每次调用的公共设施(token/限流/签名/信封) + ├── Lingxing{Order,Product,Shop,Settlement,AfterSale,Outbound}Source + ├── Lingxing{OutboundOrder,Label,ShipmentReview,OrderEdit}Source ERP 级,全平台共用 + │ + ├── multiplatform/ 多平台统一接口(大多数子平台共用) + │ ├── order MultiPlatformOrderSource / LingxingOrderFilters + │ ├── product LingxingProductSearchMapper / LingxingProductSearchBody + │ ├── shop MultiPlatformShopSource + │ ├── outbound MultiPlatformOutboundSource / OutboundOkDto / OutboundFailDto + │ └── dto MultiPlatformShopDto + │ + ├── amazon/ + │ ├── dto FbmOrderDto / FbmOrderItemDto + │ ├── order AmazonOrderSource / AmazonFbmOrderSource + │ ├── sc/ AmazonScSubPlatform + │ │ ├── product AmazonScProductSource + │ │ ├── shop AmazonScShopSource + │ │ └── dto AmazonOrder(Dto|Item|DetailDto|DetailItemDto) / + │ │ AmazonScListingDto / AmazonScShopDto / + │ │ AmazonSettlementTransactionDto / FbmOrderDetailDto + │ ├── vc/ AmazonVcSubPlatform + │ │ ├── order VcOrderSource + │ │ ├── product AmazonVcProductSource + │ │ ├── shop VcShopSource + │ │ └── dto VcOrderDto / VcOrderItemDto / VcOrderDfDetailDto / + │ │ VcOrderPoDetailDto / VcOrderDetailItemDto / + │ │ AmazonVcListingDto / VcShopDto + │ └── settlement AmazonSettlementSource + │ + ├── wms/ ERP 级实现(不区分平台) + │ ├── WmsOutboundOrderSource / WmsLabelSource / + │ │ ShipmentReviewSource / OrderEditSource + │ └── dto WmsOutboundOrder(Dto|ItemDto) / WmsLogisticsLabelDto / + │ WmsSurfaceFileDto / ShipmentReview(Data|Success|Failure)Dto / + │ OrderEditErrorDto + │ + ├── aftersale/ LingxingAfterSaleListSource / LingxingAfterSaleMapper + │ └── dto AfterSaleDto / AfterSaleItemDto / AmountDetailDto + │ + ├── aliexpress/ AliexpressSubPlatform + │ ├── product AliexpressProductSource + │ └── dto AliexpressListingDto / Warehouse / SupplyPrice + ├── ebay/ EbaySubPlatform + │ ├── product EbayProductSource + │ └── dto EbayListingDto / EbayAutoRestockDto + ├── shein/ SheinSubPlatform + │ ├── product SheinProductSource + │ └── dto SheinListingDto / Site / Warehouse / SupplyPrice + ├── target/ TargetSubPlatform + │ ├── product TargetProductSource + │ └── dto TargetListingDto / TargetLocationDto + ├── temu/ TemuSubPlatform + │ ├── product TemuProductSource + │ └── dto TemuListingDto / Warehouse / SupplyPrice / PromotionalPrice + ├── tiktok/ TiktokSubPlatform + │ ├── product TiktokProductSource + │ └── dto TiktokListingDto / TiktokWarehouseDto + ├── walmart/ WalmartSubPlatform + │ ├── order WalmartOrderSource + │ ├── product WalmartProductSource + │ └── dto WalmartListingDto + │ + └── 仅订单 + 店铺(多平台通用接口): + aeph/ · bestbuy/ · custom/ · echo/ · losdlius/ · michaels/ · mirakl/ · wayfair/ ``` 包名统一前缀 `common.ecommerce.`,下表省略前缀。 -### `model` —— 领域模型 +### `shared` —— 跨域共享层 + +| 子包 | 内容 | +|:---|:---| +| `shared.model` | **枚举**:`Platform` / `ChannelProvider` / `Capability` / `FulfillmentMode` | +| `shared.error` | 异常体系(见下方「`shared.error`」) | +| `shared.spi` | 宿主扩展点与载体:`AccessToken` / `ChannelSecret` / `TokenStore` / `LockProvider` / `IdempotencyStore` / `SyncCursorStore` | +| `shared.idempotency` | `WriteScope` / `WriteResult` / `WriteAudit` / `IdempotencyGuard` | +| `shared.audit` | `CallObserver` / `CallRecord` / `CallOutcome` | +| `shared.sync` | `SyncSpec` / `SyncResult` | +| `shared.support` | `Money` / `PlatformTime` / `Page` / `CanonicalKeys` | + +### `channel.model` —— 领域模型 所有对象**不可变**,用 Builder 构造,无 setter。Java 8 不引入 record/sealed。 @@ -70,31 +289,32 @@ common.ecommerce | 子包 | 内容 | |:---|:---| -| `model`(本包) | **枚举**:`Platform` / `ChannelProvider` / `Capability` / `FulfillmentMode` | -| `model.account` | `AccountKey` / `ChannelAccount` | -| `model.order` | `SalesOrder` / `OrderLine` / `SalesOrderQuery` / `SalesOrderRef` | -| `model.product` | `ProductListing` / `ProductQuery` / `ProductRef` / `ProductSyncStrategy` | -| `model.support` | `Money` / `PlatformTime` / `Page` / `CanonicalKeys` | +| `channel.model.account` | `AccountKey` / `ChannelAccount` | +| `channel.model.order` | `SalesOrder` / `OrderLine` / `SalesOrderQuery` / `SalesOrderRef` | +| `channel.model.product` | `ProductListing` / `ProductQuery` / `ProductRef` / `ProductSearchField` / `ProductStatus` / `ProductSyncStrategy` | +| `channel.model.fulfillment` | `OutboundOrder` / `OutboundOrderLine` / `OutboundOrderQuery` / `OutboundPackage` / `OutboundResult` / `ShippingLabel` / `LabelQuery` / `OrderEditRequest` / `OrderEditResult` / `ShipmentReviewResult` / `DeclaredItem` | +| `channel.model.aftersale` | `AfterSale` / `AfterSaleQuery` / `AfterSaleType` | +| `channel.model.settlement` | `SettlementQuery` / `SettlementTransaction` | | 类 | 包袱 | 职责 | |:---|:---|:---| -| `Platform` | 枚举 | 业务平台。**不含 provider**,直连与聚合器映射到同一值 | -| `ChannelProvider` | 枚举 | 接入通道:DIRECT / LINGXING / TEAPPLIX / CUSTOM | -| `Capability` | 枚举 | 能力枚举,适配器声明、门面校验 | -| `FulfillmentMode` | 枚举 | A/C/D 三种履约模式(B 平台仓只读,不在枚举内) | +| `Platform` | 枚举(shared) | 业务平台。**不含 provider**,直连与聚合器映射到同一值 | +| `ChannelProvider` | 枚举(shared) | 接入通道:DIRECT / LINGXING / TEAPPLIX / CUSTOM | +| `Capability` | 枚举(shared) | 能力枚举,适配器声明、门面校验 | +| `FulfillmentMode` | 枚举(shared) | A/C/D 三种履约模式(B 平台仓只读,不在枚举内) | | `ProductSyncStrategy` | 枚举 | 增量 / 全量 diff / 报告(放在 `model.product`) | | `AccountKey` | 标识 | `provider + platform + omsStoreId`,所有调用的隔离维度 | | `ChannelAccount` | 配置 | 渠道账户配置。只存 `credentialRef`,**不存密钥** | -| `CanonicalKeys` | 工具 | 三级标识与指纹计算,见下方「标识体系」 | -| `PlatformTime` | 值对象 | 三轴时间:UTC 真值 + 市场当地 + 北京时间 | -| `Money` | 值对象 | `BigDecimal + Currency`,跨币种运算直接拒绝 | +| `CanonicalKeys` | 工具(shared) | 三级标识与指纹计算,见下方「标识体系」 | +| `PlatformTime` | 值对象(shared) | 三轴时间:UTC 真值 + 市场当地 + 北京时间 | +| `Money` | 值对象(shared) | `BigDecimal + Currency`,跨币种运算直接拒绝 | | `SalesOrder` / `OrderLine` | 实体 | 3P 销售订单 | | `ProductListing` | 实体 | 商品 / Listing | | `SalesOrderQuery` / `ProductQuery` | 查询 | 查询条件(时间窗 + 分页游标) | | `SalesOrderRef` / `ProductRef` | 引用 | 详情入参。**不能用裸 String**,否则订单+商品接口签名冲突 | -| `Page` | 载体 | 分页载体,`nextCursor == null` 表示结束 | +| `Page` | 载体(shared) | 分页载体,`nextCursor == null` 表示结束 | -### `capability` —— 能力接口 +### `channel.capability` —— 能力接口 适配器实现哪些接口就声明哪些能力;未实现的方法抛 `UnsupportedCapabilityException`,不静默返回空。 @@ -104,10 +324,11 @@ common.ecommerce | `AggregatorCapable` | 聚合器扩展:`listSubChannels(account)`,按子平台细化能力 | | `SalesOrderCapable` | `pull(ctx, query)` / `get(ctx, SalesOrderRef)` | | `ProductCapable` | `syncStrategy()` / `pull(ctx, query)` / `get(ctx, ProductRef)` | -| `CapabilityReport` | 能力报告:`supports()` / `supported()` / `unsupported()` | -| `SalesOrders` / `Products` | 门面持有的视图,调用前做能力检查 | +| `SettlementCapable` / `OutboundCapable` / `OutboundOrderCapable` / `ShippingLabelCapable` / `ShipmentReviewCapable` / `OrderEditCapable` / `AfterSaleCapable` | 账单 / 快速出库 / 出库单 / 面单 / 审核发货 / 订单编辑 / 售后 | +| `CapabilityReport` / `AdapterCapabilityReport` | 能力报告:`supports()` / `supported()` / `unsupported()` | +| `SalesOrders` / `Products` / `Outbounds` / `Settlements` / `AfterSales` | 门面持有的视图,调用前做能力检查 | -### `error` —— 异常体系 +### `shared.error` —— 异常体系 全部继承 `ChannelException`,带 `platform / provider / omsStoreId / operation / requestId / platformCode / retryable / rawResponse`。 @@ -128,39 +349,41 @@ common.ecommerce **同名类** `Responses` 有两个:`http.Responses`(状态码 → 异常)与 `testkit.Responses`(快捷构造响应)。测试里注意 import 哪个。 -### `sdk` —— 门面与上下文 +### `channel.sdk` —— 门面与上下文 | 类 | 职责 | |:---|:---| | `ChannelContext` | 单次调用上下文:`account` + `connection` + `requestId` + `clock`。**由 SDK 创建,适配器不得自造** | | `AdapterFactory` | 适配器工厂:`adapterId()` / `provider()` / `platforms()` / `create(AdapterConfig)` | | `ProviderResolver` | 按 `AccountKey` 解析适配器,不自动选路 | -| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()`;`build()` 校验必需项 | +| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders` / `products` / `settlements` / `afterSales` / `outbounds` / `writes()`;`build()` 校验必需项 | | `ChannelConnection` | 一次调用的连接信息(端点 + 凭据)。**由调用方每次传入,SDK 不保存** | +| `CallSupport` | 门面调用的统一包装:能力检查 + 审计回调 | -### `idempotency` —— 写操作幂等 +### `shared.idempotency` —— 写操作幂等 | 类 | 职责 | |:---|:---| | `WriteScope` | 一次写操作的维度:`provider + platform + omsStoreId + externalStoreId + action + businessRef` | | `WriteResult` | 执行结果:`EXECUTED` / `ALREADY_COMPLETED`(回放,不算失败) | | `IdempotencyGuard` | 双锁守卫:业务键(跨 provider)+ provider 请求键(单 provider 内重试) | +| `WriteAudit` | 写操作审计留痕 | -### `sync` —— 增量同步 +### `channel.sync` + `shared.sync` —— 增量同步 | 类 | 职责 | |:---|:---| -| `SyncSpec` | 同步维度:`provider + accountKey + stream + overlap` | -| `SyncResult` | 单次结果:页数、条目数、水位线是否推进 | -| `SyncEngine` | 分页循环 + 落库 + 水位线推进 | +| `SyncSpec`(shared) | 同步维度:`provider + accountKey + stream + overlap` | +| `SyncResult`(shared) | 单次结果:页数、条目数、水位线是否推进 | +| `SyncEngine`(channel) | 分页循环 + 落库 + 水位线推进 | -### `spi` —— 宿主扩展点 +### `shared.spi` + `channel.spi` —— 宿主扩展点 **SDK 只定义,宿主实现。SDK 内部不碰 JDBC / Redis / MQ。** | SPI | 作用 | 典型实现 | |:---|:---|:---| -| `ChannelAccountRepository` | 读渠道账户 | MySQL | +| `ChannelAccountRepository`(channel) | 读渠道账户 | MySQL | | `SecretProvider` | **已不再使用**:凭据改由调用方经 `ChannelConnection` 传入 | — | | `ChannelSecret` | 凭据载体(appKey/appSecret/clientId/… + endpointBaseUrl),`fingerprint()` 供日志 | | `TokenStore` | access/refresh token 读写 | MySQL / Redis(加密) | @@ -168,7 +391,7 @@ common.ecommerce | `SyncCursorStore` | 水位线读写 | MySQL | | `IdempotencyStore` | 幂等键抢占与结果记录;`claim` 必须原子 | MySQL / Redis | | `IdempotencyClaim` / `IdempotencyRecord` / `IdempotencyStatus` | 抢占结果、记录、四态(IN_PROGRESS / SUCCEEDED / FAILED_RETRYABLE / FAILED_FINAL) | — | -| `Sink` | 领域对象落库(当前 `upsertSalesOrders` / `upsertProducts`) | MyBatis | +| `Sink`(channel) | 领域对象落库(当前 `upsertSalesOrders` / `upsertProducts`) | MyBatis | | `LockProvider` | token 刷新防击穿、账户级互斥 | Redisson / DB | ### `http` —— 出入网层 @@ -194,14 +417,64 @@ common.ecommerce ### `lingxing` —— 领星适配器 +一个聚合器适配器覆盖多个业务平台:`AccountKey.platform` 决定分派到哪个子平台实现, +子平台再按需组合订单 / 商品 / 店铺 / 结算 / 售后 / 出库各路 Source。 + +```mermaid +graph TD + A["LingxingAdapter
聚合器门面 · 能力按子平台细化"] + R["LingxingSubPlatforms
子平台注册表(按适配器实例)"] + C["LingxingCall
token / 限流 / 签名 / 信封校验"] + + subgraph P["子平台(LingxingSubPlatform)"] + ASC["Amazon SC"] --- AVC["Amazon VC"] --- WM["Walmart"] --- TK["TikTok"] + TM["Temu"] --- SH["SHEIN"] --- EB["eBay"] --- AE["AliExpress"] + WF["Wayfair"] --- MK["Mirakl"] --- TG["Target"] --- BB["BestBuy"] + AP["AEPH"] --- MC["Michaels"] --- EC["Echo"] --- LD["Losdlius"] --- CU["Custom"] + end + + subgraph S["能力 Source"] + OS["OrderSource / FbmOrderSource"] + PS["ProductSource"] + SS["ShopSource"] + TS["SettlementSource"] + AS["AfterSaleSource"] + OB["OutboundSource"] + end + + WMS["ERP 级 Source(全平台共用)
WmsOutboundOrder · WmsLabel · ShipmentReview · OrderEdit"] + + A --> R + R --> P + P --> OS + P --> PS + P --> SS + P --> TS + P --> AS + P --> OB + A --> WMS + OS --> C + PS --> C + SS --> C + TS --> C + AS --> C + OB --> C + C --> H["HttpTransport"] +``` + | 类 | 职责 | |:---|:---| -| `LingxingAdapter` | `SalesOrderCapable` + `AggregatorCapable`,订单列表拉取 | -| `LingxingConstants` | 端点、限制(31 天 / length≤500)、`platform_code → Platform` 映射 | -| `LingxingSigner` | 公共参数 ASCII 升序 + appSecret 前后包裹 + MD5 | -| `LingxingTokenClient` | 换取 access_token | -| `LingxingOrderMapper` | 领星报文 → `SalesOrder` | -| `dto/*` | 领星原始报文结构(Jackson 映射) | +| `LingxingAdapter` | 聚合器适配器:实现订单 / 商品 / 账单 / 出库 / 售后 / 面单 / 审核发货 / 订单编辑等能力,按子平台细化 `supports()` | +| `LingxingSubPlatform` / `LingxingSubPlatforms` / `LingxingSubPlatformDefaults` | 子平台能力分派接口、注册表、默认装配 | +| `LingxingCall` | 一次调用所需的公共设施:取 token、限流、签名、信封校验 | +| `platform/{子平台}/**/` | 各子平台的 Source、DTO、Mapper(如 `aliexpress/product/AliexpressProductSource`) | +| `platform/multiplatform/product/LingxingProductSearchMapper` | 统一搜索维度 `PLATFORM_SKU` / `LOCAL_SKU` → 各子平台 `searchField` 编码 | +| `platform/wms/` | ERP 级、不区分平台的接口:出库单、面单、审核发货、订单编辑 | +| `LingxingConstants` / `LingxingApi` | 端点、限流与分页限制(31 天 / length≤500 等)、`platform_code → Platform` 映射 | +| `LingxingSigner` / `LingxingRequestFactory` | 公共参数 ASCII 升序 + appSecret 前后包裹 + MD5;请求组装 | +| `LingxingRateLimiter` / `LingxingEnvelope` | 按接口令牌桶限流;领星信封 `code/msg/data` 校验 | +| `auth/LingxingTokenClient` | 换取 / 续约 access_token | +| `mapper/LingxingOrderMapper`、`dto/*` | 领星报文 → 统一模型;领星原始报文结构(Lombok) | | `LingxingAdapterFactory` | 工厂注册 | --- @@ -238,9 +511,10 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w ### 状态说明 -`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()` 已挂接, -`build()` 做必需项校验(缺 `accountRepository`、缺适配器都会抛异常)。 -目前仅接入了订单与商品两种能力,其余能力随适配器逐个补齐。 +`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders` / `products` / `settlements` / +`afterSales` / `outbounds` / `writes()` 均已挂接,`build()` 做必需项校验(缺 `accountRepository`、 +缺适配器都会抛异常)。领星适配器当前声明订单、商品、账单、标发、退货、出库单、面单、审核发货、 +订单编辑能力,能力再按子平台细化(见 3.4)。 两条调用路径都可以用:**门面**(3.3)适合业务层;**适配器 + SyncEngine**(3.1 / 3.2) 适合需要自己控制时间窗、翻页与落库的场景。 @@ -252,24 +526,25 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w ```java // 1) 宿主实现 SPI ChannelAccountRepository accountRepo = ...; // MySQL -SecretProvider secretProvider = ...; // KMS TokenStore tokenStore = ...; // 加密存储 LockProvider lockProvider = ...; // Redisson / DB // 2) 创建适配器(也可经 LingxingAdapterFactory.create) LingxingAdapter adapter = new LingxingAdapter( - LingxingConstants.DEFAULT_BASE_URL, new OkHttpTransport("common-ecommerce/1.0.0 (lingxing)"), new JacksonJsonCodec(), - secretProvider, tokenStore, lockProvider, + tokenStore, lockProvider, Clock.systemUTC()); -// 3) 取账户 → 组装调用上下文 +// 3) 取账户 + 连接 → 组装调用上下文 ChannelAccount account = accountRepo .findByKey("LINGXING", "WALMART_SC", "oms-wm-001") .orElseThrow(() -> new IllegalStateException("account not configured")); -ChannelContext ctx = ChannelContext.of(account, UUID.randomUUID().toString(), Clock.systemUTC()); +ChannelConnection connection = ChannelConnection.of(ChannelProvider.LINGXING, + LingxingConstants.PRODUCTION_BASE_URL, secret); // 凭据由调用方每次传入 + +ChannelContext ctx = ChannelContext.of(account, connection, UUID.randomUUID().toString(), Clock.systemUTC()); // 4) 调用 Page page = adapter.pull(ctx, SalesOrderQuery.builder() @@ -328,7 +603,7 @@ ChannelSdk sdk = ChannelSdk.builder() .accountRepository(accountRepo) // 必需 .clock(Clock.systemUTC()) // 可选,默认 UTC .idempotencyStore(idempotencyStore) // 写操作用;不注入则 writes() 失败 - .register(new LingxingAdapterFactory(secretProvider, tokenStore, lockProvider, Clock.systemUTC())) + .register(new LingxingAdapterFactory(tokenStore, lockProvider, Clock.systemUTC())) .build(); // 缺必需项立刻抛异常 AccountKey key = AccountKey.of(ChannelProvider.LINGXING, Platform.WALMART_SC, "oms-wm-001"); @@ -411,9 +686,9 @@ result.outcome(); // EXECUTED / ALREADY_COMPLETED ### 4.1 新增一个直连平台 -以新增 `amazon-sc` 为例,**不改 core、不改门面、不改宿主**。 +以新增 `amazon-sc` 为例,**不改 channel、不改门面、不改宿主**。 -**第 1 步:建模块**,`pom.xml` 只依赖 core 与 http。 +**第 1 步:建模块**,`pom.xml` 只依赖 channel、http 与 shared。 **第 2 步:实现能力接口**。只实现真正支持的,其余不实现: @@ -499,9 +774,9 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC | 不做 | 原因 | |:---|:---| -| `core` 引 Spring / JDBC / Redis / MQ | SDK 要能脱离宿主单测 | +| `channel` 引 Spring / JDBC / Redis / MQ | SDK 要能脱离宿主单测 | | 把平台端点、字段名做成配置表 | 协议是代码,配置化会让线上线下跑不同协议 | -| 密钥写入 `ChannelAccount` | 只能存 `credentialRef`,密钥走 `SecretProvider` | +| 密钥写入 `ChannelAccount` | 只能存 `credentialRef`,密钥经 `ChannelConnection` 在调用时传入 | | provider 进 canonicalKey | 直连/聚合器切换会产生重复实体 | | 在适配器里 `new Thread` / 定时器 | 调度归宿主,SDK 不许私起线程 | | 能力声明与实际实现不一致 | 验收项,缺失能力必须显式抛异常 | @@ -528,20 +803,21 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC src/test/resources/fixtures/{platform}/{operation}/{case}.json ``` -例:`lingxing/src/test/resources/fixtures/lingxing/orderList/success.json` +例:`lingxing/src/test/resources/fixtures/lingxing/walmartListing/success.json` 每个平台至少准备「正常 + 异常」两套。 ### 写法 ```java -// 联调直接用真实接口,见 LingxingLiveSmokeTest +// 联调直接用真实接口,见 LingxingLiveSmokeTest; +// 契约测试用 RecordingTransport + 夹具,不联网 -LingxingAdapter adapter = new LingxingAdapter(LingxingConstants.DEFAULT_BASE_URL, transport, - new JacksonJsonCodec(), accounts, tokenStore, locks, +LingxingAdapter adapter = new LingxingAdapter(transport, + new JacksonJsonCodec(), tokenStore, locks, Clock.fixed(Instant.parse("2026-10-29T00:00:00Z"), ZoneOffset.UTC)); -ChannelContext ctx = ChannelContext.of(account, "req-1", clock); +ChannelContext ctx = ChannelContext.of(account, connection, "req-1", clock); Page page = adapter.pull(ctx, SalesOrderQuery.builder() .updatedAfter(Instant.parse("2026-10-25T00:00:00Z")) .updatedBefore(Instant.parse("2026-10-26T00:00:00Z")) @@ -556,12 +832,12 @@ assertTrue(last.body().contains("\"platform_code\":10008")); assertEquals("PO-123456789", page.items().get(0).channelOrderId()); ``` -完整示例见 `lingxing/src/test/java/.../LingxingAdapterTest.java`。 +完整示例见 `lingxing/src/test/java/.../LingxingSdkListingCallTest.java`。 直连抽象与幂等守卫不用真平台也能测: ```java -// core 抽象没被聚合器带偏:单平台、能力并集、游标翻页 +// channel 抽象没被聚合器带偏:单平台、能力并集、游标翻页 FakeDirectAdapter adapter = FakeDirectAdapter.builder().orders(5).pageSize(2).build(); // 双锁幂等:第二次调用回放,平台只真正写一次 @@ -577,7 +853,7 @@ assertEquals(1, adapter.writeCallCount()); ```bash mvn test # 全部 mvn -pl lingxing test # 单模块 -mvn -pl lingxing -Dtest=LingxingAdapterTest test +mvn -pl lingxing -Dtest=LingxingSdkListingCallTest test ``` --- diff --git a/channel/pom.xml b/channel/pom.xml new file mode 100644 index 0000000..51a861e --- /dev/null +++ b/channel/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + + ecommerce + common-ecommerce + 1.0.0-SNAPSHOT + + + common-ecommerce-channel + 渠道域:领域模型、能力接口、门面、同步管道(无平台代码) + + + + ecommerce + common-ecommerce-shared + + + org.slf4j + slf4j-api + + + org.junit.jupiter + junit-jupiter + test + + + diff --git a/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java b/channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java similarity index 93% rename from core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java rename to channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java index 19345b5..7664d9c 100644 --- a/core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java @@ -1,7 +1,7 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; import java.util.EnumSet; diff --git a/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java similarity index 53% rename from core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java index 76d360a..d76eb29 100644 --- a/core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java @@ -1,12 +1,12 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.error.ChannelException; -import common.ecommerce.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.sdk.ChannelContext; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelContext; /** * 售后能力:拉取售后订单(退款 / 退货 / 换货)。 diff --git a/core/src/main/java/common/ecommerce/capability/AfterSales.java b/channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java similarity index 83% rename from core/src/main/java/common/ecommerce/capability/AfterSales.java rename to channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java index 32febf1..28be3d6 100644 --- a/core/src/main/java/common/ecommerce/capability/AfterSales.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java @@ -1,14 +1,14 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.error.ChannelException; -import common.ecommerce.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.channel.sdk.ChannelContext; /** * 门面持有的售后视图。调用前做能力检查,缺失时显式拒绝。 diff --git a/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java similarity index 97% rename from core/src/main/java/common/ecommerce/capability/AggregatorCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java index efc61a1..29416c0 100644 --- a/core/src/main/java/common/ecommerce/capability/AggregatorCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.Platform; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/CapabilityReport.java b/channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java similarity index 87% rename from core/src/main/java/common/ecommerce/capability/CapabilityReport.java rename to channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java index e394250..cfa1c02 100644 --- a/core/src/main/java/common/ecommerce/capability/CapabilityReport.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java @@ -1,6 +1,6 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.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/InboundReceiptCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java similarity index 100% rename from core/src/main/java/common/ecommerce/capability/InboundReceiptCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java diff --git a/core/src/main/java/common/ecommerce/capability/InboundShipmentCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java similarity index 100% rename from core/src/main/java/common/ecommerce/capability/InboundShipmentCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java diff --git a/core/src/main/java/common/ecommerce/capability/Inbounds.java b/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java similarity index 100% rename from core/src/main/java/common/ecommerce/capability/Inbounds.java rename to channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java diff --git a/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java similarity index 73% rename from core/src/main/java/common/ecommerce/capability/OrderEditCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java index 0740a86..ed1db08 100644 --- a/core/src/main/java/common/ecommerce/capability/OrderEditCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.Capability; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/OutboundCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java similarity index 81% rename from core/src/main/java/common/ecommerce/capability/OutboundCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java index eca0a30..ed9dab2 100644 --- a/core/src/main/java/common/ecommerce/capability/OutboundCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java @@ -1,8 +1,8 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.fulfillment.OutboundPackage; -import common.ecommerce.model.fulfillment.OutboundResult; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.fulfillment.OutboundPackage; +import common.ecommerce.channel.model.fulfillment.OutboundResult; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java similarity index 63% rename from core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java index bc2b3e1..5e78e58 100644 --- a/core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelContext; /** * 销售出库单(仓库出库单据)查询能力。 diff --git a/core/src/main/java/common/ecommerce/capability/Outbounds.java b/channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java similarity index 90% rename from core/src/main/java/common/ecommerce/capability/Outbounds.java rename to channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java index 61daa41..52973aa 100644 --- a/core/src/main/java/common/ecommerce/capability/Outbounds.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java @@ -1,20 +1,20 @@ -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.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; -import common.ecommerce.model.fulfillment.OutboundPackage; -import common.ecommerce.model.fulfillment.OutboundResult; -import common.ecommerce.model.fulfillment.ShipmentReviewResult; -import common.ecommerce.model.fulfillment.ShippingLabel; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +package common.ecommerce.channel.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.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.channel.model.fulfillment.OutboundPackage; +import common.ecommerce.channel.model.fulfillment.OutboundResult; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java b/channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java similarity index 81% rename from core/src/main/java/common/ecommerce/capability/PlatformAdapter.java rename to channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java index 873e12f..8637ce0 100644 --- a/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Platform; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +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/channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java similarity index 71% rename from core/src/main/java/common/ecommerce/capability/ProductCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java index dd63a98..70eda79 100644 --- a/core/src/main/java/common/ecommerce/capability/ProductCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java @@ -1,12 +1,12 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.Capability; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductRef; -import common.ecommerce.model.product.ProductSyncStrategy; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductRef; +import common.ecommerce.channel.model.product.ProductSyncStrategy; +import common.ecommerce.channel.sdk.ChannelContext; /** * 商品 / Listing 能力。 diff --git a/core/src/main/java/common/ecommerce/capability/Products.java b/channel/src/main/java/common/ecommerce/channel/capability/Products.java similarity index 84% rename from core/src/main/java/common/ecommerce/capability/Products.java rename to channel/src/main/java/common/ecommerce/channel/capability/Products.java index a99e231..053f322 100644 --- a/core/src/main/java/common/ecommerce/capability/Products.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/Products.java @@ -1,15 +1,15 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.error.ChannelException; -import common.ecommerce.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductRef; -import common.ecommerce.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductRef; +import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.channel.sdk.ChannelContext; /** 门面持有的商品视图。 */ public final class Products { diff --git a/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java similarity index 73% rename from core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java index 18b9c20..59f7045 100644 --- a/core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java @@ -1,12 +1,12 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.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.sdk.ChannelContext; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.sdk.ChannelContext; /** * 3P 销售订单能力:消费者订单。 diff --git a/core/src/main/java/common/ecommerce/capability/SalesOrders.java b/channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java similarity index 89% rename from core/src/main/java/common/ecommerce/capability/SalesOrders.java rename to channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java index 22d17ff..ff0d5fb 100644 --- a/core/src/main/java/common/ecommerce/capability/SalesOrders.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java @@ -1,18 +1,18 @@ -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.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +package common.ecommerce.channel.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.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/SettlementCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java similarity index 66% rename from core/src/main/java/common/ecommerce/capability/SettlementCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java index 3b5f2d6..cb3833d 100644 --- a/core/src/main/java/common/ecommerce/capability/SettlementCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.settlement.SettlementQuery; -import common.ecommerce.model.settlement.SettlementTransaction; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelContext; /** * 结算 / 账单能力:拉取平台结算交易明细。 diff --git a/core/src/main/java/common/ecommerce/capability/Settlements.java b/channel/src/main/java/common/ecommerce/channel/capability/Settlements.java similarity index 84% rename from core/src/main/java/common/ecommerce/capability/Settlements.java rename to channel/src/main/java/common/ecommerce/channel/capability/Settlements.java index 80aedd3..f6e6592 100644 --- a/core/src/main/java/common/ecommerce/capability/Settlements.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/Settlements.java @@ -1,14 +1,14 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.error.ChannelException; -import common.ecommerce.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.channel.sdk.ChannelContext; /** * 门面持有的结算视图。调用前做能力检查,缺失时显式拒绝。 diff --git a/core/src/main/java/common/ecommerce/capability/ShipmentReviewCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java similarity index 79% rename from core/src/main/java/common/ecommerce/capability/ShipmentReviewCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java index ef8b70f..c25fc86 100644 --- a/core/src/main/java/common/ecommerce/capability/ShipmentReviewCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java @@ -1,7 +1,7 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.fulfillment.ShipmentReviewResult; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/capability/ShippingLabelCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java similarity index 67% rename from core/src/main/java/common/ecommerce/capability/ShippingLabelCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java index 25272a8..c2fd87b 100644 --- a/core/src/main/java/common/ecommerce/capability/ShippingLabelCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java @@ -1,8 +1,8 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.ShippingLabel; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; +import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/core/src/main/java/common/ecommerce/model/account/AccountKey.java b/channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java similarity index 92% rename from core/src/main/java/common/ecommerce/model/account/AccountKey.java rename to channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java index f66f628..8de6319 100644 --- a/core/src/main/java/common/ecommerce/model/account/AccountKey.java +++ b/channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java @@ -1,8 +1,8 @@ -package common.ecommerce.model.account; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java similarity index 94% rename from core/src/main/java/common/ecommerce/model/account/ChannelAccount.java rename to channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java index 3a6e971..7222d16 100644 --- a/core/src/main/java/common/ecommerce/model/account/ChannelAccount.java +++ b/channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java @@ -1,7 +1,7 @@ -package common.ecommerce.model.account; +package common.ecommerce.channel.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; @@ -11,8 +11,8 @@ import java.util.Objects; /** * 渠道账户。一个 omsStoreId 可绑定多个 provider 账户。 * - *

凭证不落配置:本对象只保存 {@code credentialRef},真实密钥由宿主 - * {@code SecretProvider} 按引用取出。

+ *

凭证不落配置:本对象只保存 {@code credentialRef}(账户维度的标识), + * 真实密钥由调用方在每次调用时经 {@code ChannelConnection} 传入,SDK 不保存、不读取。

*/ public final class ChannelAccount { @@ -31,7 +31,7 @@ public final class ChannelAccount { /** 市场 ID 列表;单市场平台可为空列表。 */ private final List marketplaceIds; - /** 凭证引用(SecretProvider 的键),不是密钥本身。 */ + /** 凭证引用(宿主侧密钥条目的标识),不是密钥本身;真实密钥经 ChannelConnection 传入。 */ private final String credentialRef; /** 市场时区 IANA ID,如 America/Los_Angeles。 */ diff --git a/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java rename to channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java index d42d862..df52494 100644 --- a/core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java +++ b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java @@ -1,9 +1,9 @@ -package common.ecommerce.model.aftersale; +package common.ecommerce.channel.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/aftersale/AfterSaleQuery.java b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/aftersale/AfterSaleQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java index a880332..c57ca0e 100644 --- a/core/src/main/java/common/ecommerce/model/aftersale/AfterSaleQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.aftersale; +package common.ecommerce.channel.model.aftersale; import java.time.LocalDate; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/aftersale/AfterSaleType.java b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java similarity index 90% rename from core/src/main/java/common/ecommerce/model/aftersale/AfterSaleType.java rename to channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java index 75321e2..12a7057 100644 --- a/core/src/main/java/common/ecommerce/model/aftersale/AfterSaleType.java +++ b/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.aftersale; +package common.ecommerce.channel.model.aftersale; /** * 售后类型。 diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/DeclaredItem.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/fulfillment/DeclaredItem.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java index 0adfeb9..2941d3e 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/DeclaredItem.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/LabelQuery.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/fulfillment/LabelQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java index ad41a2b..70453c7 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/LabelQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OrderEditRequest.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/fulfillment/OrderEditRequest.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java index b7cf26b..24265c0 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OrderEditRequest.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OrderEditResult.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/fulfillment/OrderEditResult.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java index 0abadce..2e7f4a6 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OrderEditResult.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java index 170d312..55574a6 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java @@ -1,8 +1,8 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java index 0db96c8..a2c0e44 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java @@ -1,6 +1,6 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.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/OutboundOrderQuery.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java index 2c138ce..e085b16 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.time.Instant; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundPackage.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/fulfillment/OutboundPackage.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java index 27b937a..53d7a78 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundPackage.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.util.Objects; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundResult.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/fulfillment/OutboundResult.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java index d53cc0a..9c7d11b 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/OutboundResult.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/ShipmentReviewResult.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/fulfillment/ShipmentReviewResult.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java index 23e732e..04ff8fd 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/ShipmentReviewResult.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java rename to channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java index 82a9a2c..1ebb6b6 100644 --- a/core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java +++ b/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java @@ -1,6 +1,6 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/order/OrderLine.java rename to channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java index 752ab1c..81d5e6a 100644 --- a/core/src/main/java/common/ecommerce/model/order/OrderLine.java +++ b/channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java @@ -1,6 +1,6 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/order/SalesOrder.java rename to channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java index edfbcd3..c123332 100644 --- a/core/src/main/java/common/ecommerce/model/order/SalesOrder.java +++ b/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java @@ -1,8 +1,8 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.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/order/SalesOrderQuery.java b/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/order/SalesOrderQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java index 85f744c..8815217 100644 --- a/core/src/main/java/common/ecommerce/model/order/SalesOrderQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.model.order; import java.time.Instant; import java.util.Objects; diff --git a/core/src/main/java/common/ecommerce/model/order/SalesOrderRef.java b/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java similarity index 94% rename from core/src/main/java/common/ecommerce/model/order/SalesOrderRef.java rename to channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java index 7d67e3c..dd1a43f 100644 --- a/core/src/main/java/common/ecommerce/model/order/SalesOrderRef.java +++ b/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java @@ -1,6 +1,6 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.model.order; -import common.ecommerce.model.product.ProductRef; +import common.ecommerce.channel.model.product.ProductRef; import java.util.Objects; diff --git a/core/src/main/java/common/ecommerce/model/product/ProductListing.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/product/ProductListing.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java index 03c16d1..d4cd02d 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductListing.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java @@ -1,9 +1,9 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.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/product/ProductQuery.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/product/ProductQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java index 27c689a..1b1c04c 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; import java.time.Instant; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/product/ProductRef.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java similarity index 96% rename from core/src/main/java/common/ecommerce/model/product/ProductRef.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java index 3e0f693..12e45b3 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductRef.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; import java.util.Objects; diff --git a/core/src/main/java/common/ecommerce/model/product/ProductSearchField.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java similarity index 93% rename from core/src/main/java/common/ecommerce/model/product/ProductSearchField.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java index a562162..c27f414 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductSearchField.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; /** * 商品搜索维度。 diff --git a/core/src/main/java/common/ecommerce/model/product/ProductStatus.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java similarity index 91% rename from core/src/main/java/common/ecommerce/model/product/ProductStatus.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java index 94eea66..8b8139d 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductStatus.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; /** * 统一商品状态。 diff --git a/core/src/main/java/common/ecommerce/model/product/ProductSyncStrategy.java b/channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java similarity index 90% rename from core/src/main/java/common/ecommerce/model/product/ProductSyncStrategy.java rename to channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java index e395b3e..9392fd6 100644 --- a/core/src/main/java/common/ecommerce/model/product/ProductSyncStrategy.java +++ b/channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; /** 商品同步策略,适配器声明自己支持哪一种。 */ public enum ProductSyncStrategy { diff --git a/core/src/main/java/common/ecommerce/model/settlement/SettlementQuery.java b/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/settlement/SettlementQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java index 0fc20a0..c94f2bf 100644 --- a/core/src/main/java/common/ecommerce/model/settlement/SettlementQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.settlement; +package common.ecommerce.channel.model.settlement; import java.time.Instant; import java.time.LocalDate; diff --git a/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java b/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java rename to channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java index 88db768..cdeb594 100644 --- a/core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java +++ b/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java @@ -1,8 +1,8 @@ -package common.ecommerce.model.settlement; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java similarity index 87% rename from core/src/main/java/common/ecommerce/sdk/AdapterFactory.java rename to channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java index e855f7e..d85aefc 100644 --- a/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java @@ -1,9 +1,9 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.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.channel.capability.PlatformAdapter; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; import java.util.EnumSet; @@ -37,7 +37,7 @@ public interface AdapterFactory { *

不是配置项:SDK 不读配置文件、不查配置中心。端点、路径、限流等协议细节 * 全部内置在适配器代码里;这里只承载「测试/联调时替换目标地址」这一种由调用方显式传入的 * 参数。凭证与账户信息(含沙箱标记)属于账户数据,调用时经 - * {@link common.ecommerce.sdk.ChannelContext} 传入。

+ * {@link common.ecommerce.channel.sdk.ChannelContext} 传入。

*/ final class AdapterConfig { diff --git a/core/src/main/java/common/ecommerce/sdk/CallSupport.java b/channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java similarity index 98% rename from core/src/main/java/common/ecommerce/sdk/CallSupport.java rename to channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java index b766cea..ba36c52 100644 --- a/core/src/main/java/common/ecommerce/sdk/CallSupport.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java @@ -1,8 +1,8 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java similarity index 97% rename from core/src/main/java/common/ecommerce/sdk/ChannelConnection.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java index beaef45..ffde622 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java @@ -1,6 +1,6 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.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/channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java similarity index 94% rename from core/src/main/java/common/ecommerce/sdk/ChannelContext.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java index 20d6e34..c18325f 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java @@ -1,10 +1,10 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.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.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +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/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java similarity index 92% rename from core/src/main/java/common/ecommerce/sdk/ChannelSdk.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java index c414946..cc7e411 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java @@ -1,26 +1,25 @@ -package common.ecommerce.sdk; - -import common.ecommerce.model.Platform; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.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.capability.CapabilityReport; -import common.ecommerce.capability.Inbounds; -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.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; +package common.ecommerce.channel.sdk; + +import common.ecommerce.shared.model.Platform; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.audit.Slf4jCallObserver; +import common.ecommerce.channel.capability.AdapterCapabilityReport; +import common.ecommerce.channel.capability.AfterSales; +import common.ecommerce.channel.capability.AggregatorCapable; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.capability.CapabilityReport; +import common.ecommerce.channel.capability.PlatformAdapter; +import common.ecommerce.channel.capability.Products; +import common.ecommerce.channel.capability.SalesOrders; +import common.ecommerce.channel.capability.Outbounds; +import common.ecommerce.channel.capability.Settlements; +import common.ecommerce.shared.idempotency.IdempotencyGuard; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.spi.ChannelAccountRepository; +import common.ecommerce.channel.sdk.AdapterFactory.AdapterConfig; +import common.ecommerce.shared.spi.IdempotencyStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -203,18 +202,6 @@ public final class ChannelSdk implements ProviderResolver { } /** - * 入库视图:平台仓入库货件与 FBA 到货接收明细(只读)。 - * - *

能力检查发生在 {@code shipments()} / {@code receipts()} 调用时; - * 适配器未实现对应接口或未声明能力时抛 - * {@code UnsupportedCapabilityException}。

- */ - public Inbounds inbounds(AccountKey key, ChannelConnection connection) { - ChannelAccount account = requireAccount(key); - return new Inbounds(resolve(key), account, newContext(account, connection), callObserver); - } - - /** * 聚合器的子店铺列表(如领星下已授权的亚马逊 / 沃尔玛店铺)。 * *

典型用途是首次接入:把 platformCode + externalStoreId 拉下来, diff --git a/core/src/main/java/common/ecommerce/sdk/ProviderResolver.java b/channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java similarity index 71% rename from core/src/main/java/common/ecommerce/sdk/ProviderResolver.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java index a0ff4c0..abcf9e1 100644 --- a/core/src/main/java/common/ecommerce/sdk/ProviderResolver.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java @@ -1,7 +1,7 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.sdk; -import common.ecommerce.capability.PlatformAdapter; -import common.ecommerce.model.account.AccountKey; +import common.ecommerce.channel.capability.PlatformAdapter; +import common.ecommerce.channel.model.account.AccountKey; /** * 按 AccountKey 解析适配器。 diff --git a/core/src/main/java/common/ecommerce/spi/ChannelAccountRepository.java b/channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java similarity index 89% rename from core/src/main/java/common/ecommerce/spi/ChannelAccountRepository.java rename to channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java index cb6848f..d4f06b8 100644 --- a/core/src/main/java/common/ecommerce/spi/ChannelAccountRepository.java +++ b/channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java @@ -1,6 +1,6 @@ -package common.ecommerce.spi; +package common.ecommerce.channel.spi; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.channel.model.account.ChannelAccount; import java.util.Optional; diff --git a/core/src/main/java/common/ecommerce/spi/Sink.java b/channel/src/main/java/common/ecommerce/channel/spi/Sink.java similarity index 76% rename from core/src/main/java/common/ecommerce/spi/Sink.java rename to channel/src/main/java/common/ecommerce/channel/spi/Sink.java index 72348a3..f1c31a1 100644 --- a/core/src/main/java/common/ecommerce/spi/Sink.java +++ b/channel/src/main/java/common/ecommerce/channel/spi/Sink.java @@ -1,8 +1,8 @@ -package common.ecommerce.spi; +package common.ecommerce.channel.spi; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.order.SalesOrder; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.order.SalesOrder; /** * 领域对象落库 SPI。SDK 只调用,不碰数据库。 diff --git a/core/src/main/java/common/ecommerce/sync/SyncEngine.java b/channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java similarity index 89% rename from core/src/main/java/common/ecommerce/sync/SyncEngine.java rename to channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java index 83bfcde..64114a9 100644 --- a/core/src/main/java/common/ecommerce/sync/SyncEngine.java +++ b/channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java @@ -1,10 +1,12 @@ -package common.ecommerce.sync; +package common.ecommerce.channel.sync; -import common.ecommerce.model.support.Page; -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.support.Page; +import common.ecommerce.shared.sync.SyncResult; +import common.ecommerce.shared.sync.SyncSpec; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.spi.Sink; +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/channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java similarity index 88% rename from core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java rename to channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java index 3c7491e..23fac4d 100644 --- a/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java +++ b/channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java @@ -1,20 +1,20 @@ -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.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.OrderEditRequest; -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; +package common.ecommerce.channel.capability; + +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.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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/channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java similarity index 88% rename from core/src/test/java/common/ecommerce/sdk/CallObserverTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java index 552516a..4760f85 100644 --- a/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java +++ b/channel/src/test/java/common/ecommerce/channel/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.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; +package common.ecommerce.channel.sdk; + +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.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.product.ProductQuery; +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/channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java similarity index 74% rename from core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java index 2e5b744..6f18381 100644 --- a/core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java +++ b/channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java @@ -1,19 +1,19 @@ -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.model.account.AccountKey; -import common.ecommerce.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.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.spi.ChannelAccountRepository; +package common.ecommerce.channel.sdk; + +import common.ecommerce.channel.capability.CapabilityReport; +import common.ecommerce.channel.capability.PlatformAdapter; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.idempotency.WriteResult; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.channel.spi.ChannelAccountRepository; import org.junit.jupiter.api.Test; import java.util.Collections; @@ -37,10 +37,10 @@ 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 { + static final class FakeDirectAdapter implements common.ecommerce.channel.capability.SalesOrderCapable { @Override public String adapterId() { @@ -68,7 +68,7 @@ class ChannelSdkTest { } @Override - public SalesOrder get(ChannelContext ctx, common.ecommerce.model.order.SalesOrderRef ref) { + public SalesOrder get(ChannelContext ctx, common.ecommerce.channel.model.order.SalesOrderRef ref) { return null; } } @@ -166,7 +166,7 @@ class ChannelSdkTest { void missingCapabilityThrowsUnsupported() { ChannelSdk sdk = sdkWith(new FakeDirectAdapter()); assertThrows(ChannelException.UnsupportedCapabilityException.class, - () -> sdk.products(WM, CONNECTION).pull(common.ecommerce.model.product.ProductQuery.builder().build())); + () -> sdk.products(WM, CONNECTION).pull(common.ecommerce.channel.model.product.ProductQuery.builder().build())); } @Test @@ -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/channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java similarity index 92% rename from core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java index d0d7bfa..9b63680 100644 --- a/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java +++ b/channel/src/test/java/common/ecommerce/channel/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.capability.CapabilityReport; -import common.ecommerce.model.Capability; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.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; +package common.ecommerce.channel.sdk; + +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.channel.capability.CapabilityReport; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.spi.ChannelSecret; import org.junit.jupiter.api.Test; import java.time.Clock; @@ -246,7 +246,7 @@ class RequestIdAndCoverageTest { /** 只为了让「缓存门面对象」的写法更像宿主代码。 */ private static final class SalesOrdersFacadeHolder { - private common.ecommerce.capability.SalesOrders view; + private common.ecommerce.channel.capability.SalesOrders view; } /** 冒烟:确认空页也能正常返回,避免上面用例受 FakeDirectAdapter 行为影响。 */ diff --git a/http/pom.xml b/http/pom.xml index 1c40ee3..16eb6a0 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -16,7 +16,7 @@ ecommerce - common-ecommerce-core + common-ecommerce-shared 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..7a4d298 100644 --- a/lingxing/pom.xml +++ b/lingxing/pom.xml @@ -16,7 +16,11 @@ ecommerce - common-ecommerce-core + common-ecommerce-shared + + + ecommerce + common-ecommerce-channel ecommerce diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java b/lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java index 3de0143..a469c05 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 0d3c878..0ff714f 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java @@ -1,5 +1,17 @@ package common.ecommerce.lingxing.adapter; +import common.ecommerce.channel.capability.AfterSaleCapable; +import common.ecommerce.channel.capability.AggregatorCapable; +import common.ecommerce.channel.capability.OrderEditCapable; +import common.ecommerce.channel.capability.OutboundCapable; +import common.ecommerce.channel.capability.OutboundOrderCapable; +import common.ecommerce.channel.capability.ProductCapable; +import common.ecommerce.channel.capability.SalesOrderCapable; +import common.ecommerce.channel.capability.SettlementCapable; +import common.ecommerce.channel.capability.ShipmentReviewCapable; +import common.ecommerce.channel.capability.ShippingLabelCapable; +import common.ecommerce.shared.error.AuthException; +import common.ecommerce.shared.error.ChannelException; import common.ecommerce.capability.AfterSaleCapable; import common.ecommerce.capability.AggregatorCapable; import common.ecommerce.capability.InboundReceiptCapable; @@ -35,40 +47,40 @@ 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.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.order.SalesOrderRef; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; -import common.ecommerce.model.fulfillment.OutboundPackage; -import common.ecommerce.model.fulfillment.OutboundResult; -import common.ecommerce.model.fulfillment.ShipmentReviewResult; -import common.ecommerce.model.fulfillment.ShippingLabel; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.channel.model.fulfillment.OutboundPackage; +import common.ecommerce.channel.model.fulfillment.OutboundResult; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; import common.ecommerce.model.inbound.InboundReceipt; import common.ecommerce.model.inbound.InboundReceiptQuery; import common.ecommerce.model.inbound.InboundShipment; import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -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.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.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductRef; +import common.ecommerce.channel.model.product.ProductSyncStrategy; +import common.ecommerce.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelContext; +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..0e52243 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java @@ -1,12 +1,12 @@ 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.sdk.AdapterFactory; -import common.ecommerce.spi.LockProvider; -import common.ecommerce.spi.TokenStore; +import common.ecommerce.channel.capability.PlatformAdapter; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.sdk.AdapterFactory; +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..e0eb579 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java @@ -2,9 +2,9 @@ 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.channel.sdk.ChannelContext; +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..cd5686c 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +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..ddc1a45 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java @@ -1,8 +1,8 @@ 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.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +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..1504bdc 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java @@ -7,9 +7,9 @@ import common.ecommerce.lingxing.LingxingApi; 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.channel.sdk.ChannelContext; +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/LingxingLabelSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java index 4022a18..b638965 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java @@ -1,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.ShippingLabel; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; import java.util.List; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java index 67343b8..a36a6b8 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java @@ -1,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; import java.util.List; 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..75dd424 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java @@ -1,8 +1,8 @@ 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.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +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..89e8b2d 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java @@ -1,8 +1,8 @@ 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.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.shared.support.Page; /** * 子平台 / 账户的销售出库单能力。 diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java index 4b4e98a..56a0d9e 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java @@ -1,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.fulfillment.OutboundPackage; -import common.ecommerce.model.fulfillment.OutboundResult; +import common.ecommerce.channel.model.fulfillment.OutboundPackage; +import common.ecommerce.channel.model.fulfillment.OutboundResult; import java.util.List; 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..10ee08f 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java @@ -1,9 +1,9 @@ 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.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +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..1dae047 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java @@ -1,9 +1,9 @@ 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.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +import common.ecommerce.shared.support.Page; /** * 子平台的结算 / 账单能力。 diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java index d300c8e..b185f7e 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; import java.util.List; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java index 22ec3a1..fa44e4b 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.lingxing.platform.LingxingCall; import java.util.List; 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 e16bae4..e4c7610 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..0a310a4 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 @@ -7,10 +7,10 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingAfterSaleSource; import common.ecommerce.lingxing.platform.LingxingCall; 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.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.channel.model.aftersale.AfterSaleType; +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..ed6933a 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.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.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleType; +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..5031848 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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 4aa12e8..0e0e9d9 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +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..fc77579 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +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 9446edd..3ba794e 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 @@ -20,7 +20,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..bbf4e37 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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..53fb8a5 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 @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform.amazon.sc.shop; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.lingxing.LingxingApi; @@ -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..6c2728b 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +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..d5eae54 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +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..40043bf 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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..c16a1c7 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 @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform.amazon.vc.shop; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.lingxing.LingxingApi; @@ -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..5f8d249 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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/LingxingOrderFilters.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/LingxingOrderFilters.java index 076530e..f1936a3 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/LingxingOrderFilters.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/LingxingOrderFilters.java @@ -7,7 +7,7 @@ import java.util.List; /** * 领星多平台订单列表({@code /pb/mp/order/v2/list})的专有过滤条件。 * - *

    通用的时间窗、分页、游标仍由 {@link common.ecommerce.model.order.SalesOrderQuery} + *

    通用的时间窗、分页、游标仍由 {@link common.ecommerce.channel.model.order.SalesOrderQuery} * 提供;这里只放领星协议独有的参数,避免把领星字段污染到 core 的跨渠道模型。

    * *

    所有条件都是可选的,全部为空时按「账户 + 更新时间窗」做常规同步。 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 e82ad0b..0a49699 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; @@ -13,10 +13,10 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.mapper.LingxingOrderMapper; import common.ecommerce.lingxing.platform.LingxingCall; 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.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +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/outbound/MultiPlatformOutboundSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/outbound/MultiPlatformOutboundSource.java index daca648..9c4b439 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/outbound/MultiPlatformOutboundSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/outbound/MultiPlatformOutboundSource.java @@ -6,8 +6,8 @@ import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingOutboundSource; -import common.ecommerce.model.fulfillment.OutboundPackage; -import common.ecommerce.model.fulfillment.OutboundResult; +import common.ecommerce.channel.model.fulfillment.OutboundPackage; +import common.ecommerce.channel.model.fulfillment.OutboundResult; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java index cc349a7..7746ad6 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform.multiplatform.product; -import common.ecommerce.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductQuery; import java.util.List; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java index 830dda9..dae865d 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform.multiplatform.product; -import common.ecommerce.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductSearchField; /** * 领星侧各平台的「搜索维度 → 平台枚举值」映射。 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..bc0e70f 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 @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.platform.multiplatform.shop; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.lingxing.LingxingApi; @@ -9,8 +9,8 @@ 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.model.account.ChannelAccount; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; import java.util.ArrayList; import java.util.Collections; 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..64ffcfa 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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..8dbb434 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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; @@ -55,7 +55,7 @@ public final class TargetProductSource implements LingxingProductSource { /** * 时间字段取值:1 创建时间、2 更新时间。用 2 才符合 - * {@link common.ecommerce.model.product.ProductQuery#updatedAfter()} 的语义。 + * {@link common.ecommerce.channel.model.product.ProductQuery#updatedAfter()} 的语义。 */ private static final int TIME_FIELD_UPDATE = 2; 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..1d610d1 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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 fe4934c..3ab6619 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 @@ -13,7 +13,7 @@ import common.ecommerce.lingxing.platform.LingxingOutboundSource; import common.ecommerce.lingxing.platform.LingxingInboundShipmentSource; import common.ecommerce.lingxing.platform.inbound.FbtCargoSource; 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..11c75ec 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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 f31f050..5fcb063 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 @@ -13,7 +13,7 @@ import common.ecommerce.lingxing.platform.inbound.WfsCargoSource; 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..ef8f57c 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.channel.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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +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..4cafa0b 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,10 +10,10 @@ import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingOrderEditSource; import common.ecommerce.lingxing.platform.wms.dto.OrderEditErrorDto; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.fulfillment.DeclaredItem; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.fulfillment.DeclaredItem; +import common.ecommerce.channel.model.fulfillment.OrderEditRequest; +import common.ecommerce.channel.model.fulfillment.OrderEditResult; import java.math.BigDecimal; import java.util.ArrayList; 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..b09798e 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,8 +13,8 @@ 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.model.fulfillment.ShipmentReviewResult; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; import java.util.ArrayList; import java.util.LinkedHashMap; 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..0d8223e 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,9 +10,9 @@ 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.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.ShippingLabel; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; import java.util.ArrayList; import java.util.LinkedHashMap; 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..3129bfc 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.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.model.ChannelProvider; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderLine; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +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..3f2e434 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java @@ -1,26 +1,26 @@ 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.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryAccounts; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; 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 965e6d6..ec314c7 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.adapter; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpTransport; @@ -9,6 +9,30 @@ import common.ecommerce.http.OkHttpTransport; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.auth.LingxingTokenClient; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderLine; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.spi.AccessToken; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.http.LingxingRateLimiter; import common.ecommerce.lingxing.http.LingxingRequestFactory; @@ -279,7 +303,7 @@ class LingxingLiveSmokeTest { SalesOrder detail = adapter.get(ctx, SalesOrderRef.of(first.channelOrderId())); System.out.println("[amazon detail] " + detail.channelOrderId() + " total=" + detail.totalAmount() + " lines=" + detail.lines().size()); - for (OrderLine line : detail.lines()) { + for (common.ecommerce.channel.model.order.OrderLine line : detail.lines()) { System.out.println(" sku=" + line.platformSku() + " qty=" + line.quantity() + " unit=" + line.unitPrice() 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..6d63df2 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java @@ -1,25 +1,25 @@ 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.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryAccounts; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -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..51cd126 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.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.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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..5a63950 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,16 +1,16 @@ 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.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.aftersale.AfterSaleType; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.channel.model.aftersale.AfterSaleType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.LocalDate; 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..f0016fc 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,10 +2,10 @@ 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.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleType; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleType; import org.junit.jupiter.api.Test; import java.time.ZoneId; 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..7e82885 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.aliexpress.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; 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..6c78c7e 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.amazon.sc.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; 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..c5eda2d 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.amazon.vc.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; 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..b3bbe77 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,15 +1,15 @@ 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.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; 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..53ecad7 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.shein.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; 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..7477fbf 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.target.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; @@ -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..67b7e50 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.temu.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.util.Arrays; 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..021b1f4 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,14 +1,14 @@ package common.ecommerce.lingxing.platform.tiktok.product; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import static common.ecommerce.lingxing.support.LingxingTestSupport.account; 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..8b8c418 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,16 +1,16 @@ 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.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; 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..91655a3 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.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.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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..0ad05b8 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingSmokeProbeTest.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.probe; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpTransport; @@ -8,21 +8,21 @@ 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.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductSearchField; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryAccounts; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; 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/SearchFieldProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java index 956e52c..441cf38 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.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.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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..1e72399 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.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.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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..d002e64 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java @@ -6,15 +6,15 @@ 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.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.testkit.RecordingTransport; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.spi.AccessToken; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.RecordingTransport; import java.time.Clock; import java.time.Instant; diff --git a/pom.xml b/pom.xml index f27a175..7386c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,8 @@ - core + shared + channel http testkit lingxing @@ -36,7 +37,12 @@ ecommerce - common-ecommerce-core + common-ecommerce-shared + ${project.version} + + + ecommerce + common-ecommerce-channel ${project.version} diff --git a/core/pom.xml b/shared/pom.xml similarity index 74% rename from core/pom.xml rename to shared/pom.xml index d8af693..d2d6bc8 100644 --- a/core/pom.xml +++ b/shared/pom.xml @@ -10,8 +10,11 @@ 1.0.0-SNAPSHOT - common-ecommerce-core - 领域模型、能力接口、门面、管道、SPI(无平台代码、无第三方运行时依赖) + common-ecommerce-shared + + 跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。 + 不依赖任何领域模块,供渠道域(core)与仓库域复用。 + diff --git a/core/src/main/java/common/ecommerce/audit/CallObserver.java b/shared/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 shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java index f6b0b2e..23f5f38 100644 --- a/core/src/main/java/common/ecommerce/audit/CallObserver.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java index b1e3f00..c025208 100644 --- a/core/src/main/java/common/ecommerce/audit/CallOutcome.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java index 85f3e3e..59e05c3 100644 --- a/core/src/main/java/common/ecommerce/audit/CallRecord.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java index fe1bf51..da522f2 100644 --- a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/AuthException.java index b721c49..2971149 100644 --- a/core/src/main/java/common/ecommerce/error/AuthException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/ChannelException.java index 6211866..a3ec522 100644 --- a/core/src/main/java/common/ecommerce/error/ChannelException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java index 18a9216..c26f4d5 100644 --- a/core/src/main/java/common/ecommerce/error/CrossProviderConflictException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java index 9c3173f..1c9a0a8 100644 --- a/core/src/main/java/common/ecommerce/error/IdempotencyConflictException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java index ed2755c..1d00b04 100644 --- a/core/src/main/java/common/ecommerce/error/PlatformBusinessException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java index 1c3183a..3193ed5 100644 --- a/core/src/main/java/common/ecommerce/error/RateLimitException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/TransientException.java index f8f5e88..9915cb3 100644 --- a/core/src/main/java/common/ecommerce/error/TransientException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/error/ValidationException.java index 0adff2f..adfdbe2 100644 --- a/core/src/main/java/common/ecommerce/error/ValidationException.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java index 2137083..e0d737d 100644 --- a/core/src/main/java/common/ecommerce/idempotency/IdempotencyGuard.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java index 2ae51ca..907db57 100644 --- a/core/src/main/java/common/ecommerce/idempotency/WriteAudit.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java index 702fb33..6a6daab 100644 --- a/core/src/main/java/common/ecommerce/idempotency/WriteResult.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java index f5d7a8f..ebd151d 100644 --- a/core/src/main/java/common/ecommerce/idempotency/WriteScope.java +++ b/shared/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/shared/src/main/java/common/ecommerce/shared/model/Capability.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/Capability.java rename to shared/src/main/java/common/ecommerce/shared/model/Capability.java index c3dab65..c7e2c64 100644 --- a/core/src/main/java/common/ecommerce/model/Capability.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/model/ChannelProvider.java index 32da2c9..df15153 100644 --- a/core/src/main/java/common/ecommerce/model/ChannelProvider.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java index 6973294..a4d8ce1 100644 --- a/core/src/main/java/common/ecommerce/model/FulfillmentMode.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/model/Platform.java index 21c177d..0f918b3 100644 --- a/core/src/main/java/common/ecommerce/model/Platform.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/AccessToken.java index 305510a..8c8c686 100644 --- a/core/src/main/java/common/ecommerce/spi/AccessToken.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java index a7e4810..7bfb33d 100644 --- a/core/src/main/java/common/ecommerce/spi/ChannelSecret.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java index 7bc63a8..619d692 100644 --- a/core/src/main/java/common/ecommerce/spi/IdempotencyClaim.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java index 3880409..d3a444b 100644 --- a/core/src/main/java/common/ecommerce/spi/IdempotencyRecord.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java index 4cec7a3..62a43ae 100644 --- a/core/src/main/java/common/ecommerce/spi/IdempotencyStatus.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java index 60969fc..23e7d01 100644 --- a/core/src/main/java/common/ecommerce/spi/IdempotencyStore.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/LockProvider.java index 34249ca..d880a50 100644 --- a/core/src/main/java/common/ecommerce/spi/LockProvider.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/SecretProvider.java index 49f6e42..1e36d3b 100644 --- a/core/src/main/java/common/ecommerce/spi/SecretProvider.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java index 89edb79..8213d1f 100644 --- a/core/src/main/java/common/ecommerce/spi/SyncCursorStore.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/spi/TokenStore.java index 5d85320..a09cd9d 100644 --- a/core/src/main/java/common/ecommerce/spi/TokenStore.java +++ b/shared/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/shared/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 shared/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/shared/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/shared/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 shared/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/shared/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/shared/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 shared/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/shared/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/shared/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 shared/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/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/sync/SyncResult.java index f7fb4d8..1125634 100644 --- a/core/src/main/java/common/ecommerce/sync/SyncResult.java +++ b/shared/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/shared/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 shared/src/main/java/common/ecommerce/shared/sync/SyncSpec.java index a6b30b7..27f1fa8 100644 --- a/core/src/main/java/common/ecommerce/sync/SyncSpec.java +++ b/shared/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/shared/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 shared/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java index 407eccf..1c84e01 100644 --- a/core/src/test/java/common/ecommerce/audit/Slf4jCallObserverTest.java +++ b/shared/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/shared/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 shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java index 2b1565e..9186ce3 100644 --- a/core/src/test/java/common/ecommerce/idempotency/WriteAuditTest.java +++ b/shared/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/shared/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 shared/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/shared/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/testkit/pom.xml b/testkit/pom.xml index 51c7af2..eed9411 100644 --- a/testkit/pom.xml +++ b/testkit/pom.xml @@ -16,7 +16,11 @@ ecommerce - common-ecommerce-core + common-ecommerce-shared + + + ecommerce + common-ecommerce-channel ecommerce diff --git a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java b/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java similarity index 88% rename from testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java index 69dcd40..7ea19d4 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java @@ -1,38 +1,32 @@ -package common.ecommerce.testkit; - -import common.ecommerce.capability.AfterSaleCapable; -import common.ecommerce.capability.InboundReceiptCapable; -import common.ecommerce.capability.InboundShipmentCapable; -import common.ecommerce.capability.ProductCapable; -import common.ecommerce.capability.SalesOrderCapable; -import common.ecommerce.error.ChannelException; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.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.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.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.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.model.product.ProductRef; -import common.ecommerce.model.product.ProductSyncStrategy; -import common.ecommerce.model.order.SalesOrder; -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; +package common.ecommerce.shared.testkit; + +import common.ecommerce.channel.capability.AfterSaleCapable; +import common.ecommerce.channel.capability.ProductCapable; +import common.ecommerce.channel.capability.SalesOrderCapable; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.channel.model.aftersale.AfterSaleType; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.support.Money; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.shared.support.PlatformTime; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.channel.model.product.ProductRef; +import common.ecommerce.channel.model.product.ProductSyncStrategy; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +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/shared/testkit/InMemoryAccounts.java similarity index 87% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java index b9879f2..5990249 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java @@ -1,9 +1,9 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.spi.ChannelAccountRepository; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.spi.SecretProvider; +import common.ecommerce.channel.spi.ChannelAccountRepository; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.channel.model.account.ChannelAccount; +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/shared/testkit/InMemoryCursorStore.java similarity index 88% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java index f1c6815..8d4fe9b 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java @@ -1,7 +1,7 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.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/shared/testkit/InMemoryIdempotencyStore.java similarity index 93% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java index 0737f24..eaa5587 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java @@ -1,10 +1,10 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.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/shared/testkit/InMemoryLockProvider.java similarity index 93% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java index 9d05724..eda5111 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java @@ -1,6 +1,6 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.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/shared/testkit/InMemorySink.java similarity index 81% rename from testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java index 91fc505..4310706 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java @@ -1,9 +1,9 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.spi.Sink; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.spi.Sink; import java.util.ArrayList; import java.util.Collections; diff --git a/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java similarity index 85% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java index 9b97224..c5ddb21 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java @@ -1,7 +1,7 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.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/JsonFixture.java b/testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java similarity index 96% rename from testkit/src/main/java/common/ecommerce/testkit/JsonFixture.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java index 6f82274..d42d001 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/JsonFixture.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import java.io.ByteArrayOutputStream; import java.io.InputStream; diff --git a/testkit/src/main/java/common/ecommerce/testkit/MutableClock.java b/testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java similarity index 96% rename from testkit/src/main/java/common/ecommerce/testkit/MutableClock.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java index fdec95c..032ba66 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/MutableClock.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import java.time.Clock; import java.time.Duration; diff --git a/testkit/src/main/java/common/ecommerce/testkit/RecordingTransport.java b/testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java similarity index 98% rename from testkit/src/main/java/common/ecommerce/testkit/RecordingTransport.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java index 02f6ecc..b19f2f0 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/RecordingTransport.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; diff --git a/testkit/src/main/java/common/ecommerce/testkit/Responses.java b/testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java similarity index 96% rename from testkit/src/main/java/common/ecommerce/testkit/Responses.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java index db5d5b8..ebfd891 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/Responses.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.http.HttpResponse; diff --git a/testkit/src/main/java/common/ecommerce/testkit/TestData.java b/testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java similarity index 74% rename from testkit/src/main/java/common/ecommerce/testkit/TestData.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java index 155f773..4433d65 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/TestData.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java @@ -1,8 +1,8 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.spi.SyncCursorStore; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.model.order.SalesOrder; +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/shared/idempotency/IdempotencyGuardTest.java similarity index 90% rename from testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java rename to testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java index 699a450..373de7e 100644 --- a/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java @@ -1,13 +1,16 @@ -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.testkit.InMemoryIdempotencyStore; -import common.ecommerce.testkit.MutableClock; +package common.ecommerce.shared.idempotency; + +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.shared.testkit.InMemoryIdempotencyStore; +import common.ecommerce.shared.testkit.MutableClock; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -187,8 +190,8 @@ class IdempotencyGuardTest { @Test void guardOnlyWritesPlatformOnceAcrossRetry() { // 适配器层记录:平台写操作只应发生一次 - common.ecommerce.testkit.FakeDirectAdapter adapter = - common.ecommerce.testkit.FakeDirectAdapter.builder().build(); + common.ecommerce.shared.testkit.FakeDirectAdapter adapter = + common.ecommerce.shared.testkit.FakeDirectAdapter.builder().build(); guard.execute(MARK_SHIPPED, () -> adapter.markShipped("pkg-1", "1Z-1"), v -> v); guard.execute(MARK_SHIPPED, () -> adapter.markShipped("pkg-1", "1Z-1"), v -> v); diff --git a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java b/testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java similarity index 83% rename from testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java rename to testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java index 6073dc9..3e21cc1 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java @@ -1,22 +1,22 @@ -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.model.account.ChannelAccount; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductRef; -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; +package common.ecommerce.shared.testkit; + +import common.ecommerce.channel.capability.AdapterCapabilityReport; +import common.ecommerce.channel.capability.CapabilityReport; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductRef; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.channel.sync.SyncEngine; +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/shared/testkit/SdkFacadeCallTest.java similarity index 89% rename from testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java rename to testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java index cd1d71b..fa7727b 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java @@ -1,5 +1,24 @@ -package common.ecommerce.testkit; - +package common.ecommerce.shared.testkit; + +import common.ecommerce.channel.capability.CapabilityReport; +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.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +import common.ecommerce.channel.model.aftersale.AfterSaleType; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; +import common.ecommerce.channel.model.product.ProductStatus; +import common.ecommerce.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; import common.ecommerce.capability.CapabilityReport; import common.ecommerce.error.ChannelException; import common.ecommerce.model.Capability; @@ -109,7 +128,7 @@ class SdkFacadeCallTest { void productQueryRejectsFuzzyAndExactTogether() { assertThrows(IllegalArgumentException.class, () -> ProductQuery.builder() - .searchField(common.ecommerce.model.product.ProductSearchField.PLATFORM_SKU) + .searchField(common.ecommerce.channel.model.product.ProductSearchField.PLATFORM_SKU) .searchValue("A") .searchValues(java.util.Arrays.asList("B")) .build()); @@ -244,7 +263,7 @@ class SdkFacadeCallTest { // FakeDirectAdapter 没有实现结算能力:取视图不报错,调用时报错 assertThrows(ChannelException.UnsupportedCapabilityException.class, () -> sdk.settlements(KEY, CONNECTION).pull( - common.ecommerce.model.settlement.SettlementQuery.builder().build())); + common.ecommerce.channel.model.settlement.SettlementQuery.builder().build())); } @Test diff --git a/操作手册.md b/操作手册.md index 1e56061..0f1cded 100644 --- a/操作手册.md +++ b/操作手册.md @@ -1,7 +1,7 @@ # common-ecommerce 操作手册 > 面向接入本 SDK 的宿主开发者。本文只讲**怎么调、参数怎么传**。 -> 设计原理见 [`GUIDE.md`](GUIDE.md),包职责速查见 [`README.md`](README.md)。 +> 设计原理见 [`GUIDE.md`](GUIDE.md),架构图与包结构见 [`README.md`](README.md)。 --- @@ -27,7 +27,7 @@ ```xml ecommerce - common-ecommerce-core + common-ecommerce-channel 1.0.0-SNAPSHOT @@ -80,7 +80,7 @@ ChannelAccount account = ChannelAccount.builder() .externalStoreId("1108413237731") // 领星 platform_code;直连账户不填 .platformCode(10008) - // 密钥引用(如果宿主仍用 SecretProvider 取密钥) + // 密钥引用(宿主侧密钥条目的标识);真实密钥经 ChannelConnection 传入,见第三节 .credentialRef("kms://oms/lingxing/store-001") // 市场当地时区,必须是合法 IANA 时区 .marketplaceZone("America/Los_Angeles") @@ -94,7 +94,7 @@ ChannelAccount account = ChannelAccount.builder() | `key` | ✅ | `provider + platform + omsStoreId`,SDK 的隔离维度 | | `externalStoreId` | ✅ | 平台店铺 ID。领星传 `store_id`;亚马逊 SC 传 `sid` | | `platformCode` | 领星必填 | 见 [platform_code 对照](#领星-platform_code-对照) | -| `credentialRef` | ✅ | 密钥引用,不是密钥本身 | +| `credentialRef` | ✅ | 密钥引用标识,不是密钥本身;真实密钥经 `ChannelConnection` 传入 | | `marketplaceZone` | ✅ | 必须是 `ZoneId.of(...)` 能解析的值 | | `currency` | ✅ | ISO 4217 | @@ -135,6 +135,8 @@ ChannelConnection conn = ChannelConnection.of( .build()); ``` +`credentialRef` 只是账户上的标识,SDK **不会**拿它去取密钥;真实密钥就在上面的 `ChannelSecret` 里。 + ### 各平台需要的凭据字段 | 平台 | 需要的字段 | @@ -217,7 +219,9 @@ while (page.nextCursor() != null) { SalesOrder order = sdk.salesOrders(key, conn).get("PO-123456789"); ``` -**领星暂未实现**,会抛 `ChannelException: lingxing order detail is not implemented yet`。 +只有亚马逊 SC / VC(含 FBM 路由)实现了详情;其它子平台抛 +`UnsupportedCapabilityException`。商品详情(`sdk.products(key, conn).get(sku)`)**全部未实现**, +会抛 `ChannelException: lingxing product detail is not implemented yet`。 --- @@ -248,14 +252,31 @@ for (ProductListing p : page.items()) { | `updatedBefore` | `Instant` | | 同上 | | `pageSize` | `int` | | 亚马逊 Listing 上限 1000 | | `cursor` | `String` | | 上一页游标 | +| `searchField` | `ProductSearchField` | | 按 SKU 搜索的维度:`PLATFORM_SKU` / `LOCAL_SKU`;不传表示不按 SKU 搜 | +| `searchValue` | `String` | | 单个**模糊**匹配值;设了 `searchField` 才能用 | +| `searchValues` | `List` | | 多个**精确**匹配值;与 `searchValue` 互斥(同时设置时会抛异常) | + +按 SKU 搜索的示例: + +```java +Page page = sdk.products(key, conn).pull( + ProductQuery.builder() + .searchField(ProductSearchField.PLATFORM_SKU) + .searchValues(Arrays.asList("SKU-1", "SKU-2")) + .build()); +``` + +领星会把上面的维度翻译成各子平台自己的 `searchField` 编码(见 `LingxingProductSearchMapper`)。 +Target 的 `LOCAL_SKU` 编码尚未实测确认,目前会显式抛 `UnsupportedOperationException`,不会静默返回错数据。 ### 当前支持范围 | provider | 平台 | 是否支持 | |:---|:---|:---:| | LINGXING | 亚马逊 SC | ✅ | -| LINGXING | 沃尔玛 | ❌(未接入) | -| LINGXING | eBay / SHEIN 等 | ❌ | +| LINGXING | 亚马逊 VC / 沃尔玛 / eBay / Temu / SHEIN / TikTok / Target / AliExpress | ✅ | +| LINGXING | 其它子平台(BestBuy / AEPH / Michaels / Echo / Losdlius / Custom …) | ❌ 商品接口未接入 | +| DIRECT | — | ❌ 暂无直连适配器 | 不支持时会抛 `ChannelException.UnsupportedCapabilityException: PRODUCT`。 @@ -269,6 +290,7 @@ for (ProductListing p : page.items()) { AccountKey aggregatorKey = AccountKey.of( ChannelProvider.LINGXING, Platform.AMAZON_SC, "oms-amz-parent"); +```java List shops = sdk.subChannels(aggregatorKey, conn); for (SubChannel shop : shops) { @@ -276,6 +298,8 @@ for (SubChannel shop : shops) { shop.externalStoreId(); // 领星店铺 sid,如 "1519" shop.platform(); // Platform.AMAZON_SC shop.name(); // 店铺名 + shop.status(); // 授权状态原值 + shop.region(); // 站点简称,如 na // 用它构造账户 ChannelAccount account = ChannelAccount.builder() @@ -294,8 +318,8 @@ for (SubChannel shop : shops) { | provider | 平台 | 接口 | |:---|:---|:---| -| LINGXING | 亚马逊 SC | `/erp/sc/data/seller/lists` ✅ | -| LINGXING | 沃尔玛 / eBay / … | ❌ | +| LINGXING | 亚马逊 SC / VC | `/erp/sc/data/seller/lists` ✅ | +| LINGXING | 沃尔玛 / eBay / Temu / SHEIN / TikTok / Target / AliExpress / Wayfair / Mirakl / BestBuy / AEPH / Michaels / Echo / Losdlius / Custom | 多平台店铺接口 `/pb/mp/shop/v2/getSellerList` ✅ | 返回的店铺会**过滤掉非正常状态**(领星 `status != 1` 的店铺)。 @@ -478,11 +502,10 @@ try { | 现象 | 原因 | 处理 | |:---|:---|:---| | `channel account not configured` | `findByKey` 没查到 | 检查 `provider/platform/omsStoreId` 三个值是否与账户一致 | -| `no adapter registered for ...` | 该 `provider + platform` 没注册适配器 | 检查 `register(...)`;领星只覆盖 8 个平台 | +| `no adapter registered for ...` | 该 `provider + platform` 没注册适配器 | 检查 `register(...)`;领星工厂覆盖 16 个子平台,不含 `WALMART_1P` | | `duplicate adapter for ...` | 同一 `provider + platform` 注册了两次 | 去掉重复的 `register` | | `UnsupportedCapabilityException` | 适配器不声明该能力 | 先 `capabilities()` 判断,或换 provider | -| `lingxing sub platform not implemented: X` | 该子平台没有实现类 | 目前只有 `WALMART_SC` / `AMAZON_SC` | -| `lingxing shop list is not supported for X` | 该子平台没有店铺接口 | 目前只有亚马逊 SC 有 | +| `lingxing sub platform not implemented: X` | 该子平台没有注册到 `LingxingSubPlatforms` | 对照 `LingxingSubPlatformDefaults.all(...)` 的注册清单 | | `lingxing code=102 msg=参数不合法` | 请求参数不对 | 检查 `sid` / `platform_code` / 时间格式 | | `lingxing code=2001013 app authentication failed` | AppID/AppSecret 错误 | 检查凭据;确认出口 IP 在白名单 | | `lingxing code=3001008` | 触发限流 | 该接口 qps=1,必须串行调用 | @@ -498,22 +521,34 @@ try { |:---:|:---| | 10001 | `AMAZON_SC` | | 10035 | `AMAZON_VC` | +| 10003 | `EBAY` | +| 10005 / 10031 | `AEPH` | | 10008 | `WALMART_SC` | +| 10010 | `WAYFAIR` | | 10011 | `TIKTOK` | -| 10022 / 10024 | `TEMU` | -| 10003 | `EBAY` | | 10021 / 10027 / 10028 | `SHEIN` | +| 10022 / 10024 | `TEMU` | +| 10029 / 10030 | `ALIEXPRESS` | | 10034 | `MIRAKL` | -| 其它 | `CUSTOM`(调用时会因未注册子平台而失败) | +| 10009 / 10017 / 其它 | `CUSTOM`(同一码下混有多个业务平台,无法用一个枚举表示) | + +> 业务平台以账户的 `AccountKey.platform` 为准,这张表只用于从店铺列表 / 订单行反推。 +> Target / BestBuy / Michaels / ECHO / LOS-DLI-US 在领星侧没有独立平台码。 --- ## 附录:当前实现状态 -| 能力 | 领星·亚马逊 SC | 领星·沃尔玛 | 直连 | -|:---|:---:|:---:|:---:| -| 订单列表 | ❌ | ✅ | ❌ | -| 订单详情 | ❌ | ❌ | ❌ | -| 商品 / Listing | ✅ | ❌ | ❌ | -| 店铺列表 | ✅ | ❌ | — | -| 写操作 | ❌ | ❌ | ❌ | +| 能力 | 亚马逊 SC | 亚马逊 VC | 沃尔玛 | Temu / SHEIN / eBay / TikTok / Target / AliExpress 等 | Direct | +|:---|:---:|:---:|:---:|:---:|:---:| +| 订单列表 | ✅ | ✅ | ✅ | ✅(多平台统一订单) | ❌ | +| 订单详情 | ✅(含 FBM) | ✅ | ❌ | ❌ | ❌ | +| 商品 / Listing | ✅ | ✅ | ✅ | ✅(8 个平台) | ❌ | +| 店铺列表 | ✅ | ✅ | ✅ | ✅ | — | +| 账单 / 结算 | ✅ | ❌ | ❌ | ❌ | ❌ | +| 售后(只读) | ✅ | ❌ | ❌ | ❌ | ❌ | +| 快速出库(写) | ✅ | ✅ | ✅ | ✅ | ❌ | +| 出库单 / 面单 / 审核发货 | ✅(ERP 级,全平台共用) | 同左 | 同左 | 同左 | ❌ | +| 订单编辑(写) | ✅(ERP 级,全平台共用) | 同左 | 同左 | 同左 | ❌ | + +写接口没有测试环境,联调时**只跑查询**。