diff --git a/GUIDE.md b/GUIDE.md index b698c47..99d2853 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -381,11 +381,11 @@ if (r.alreadyCompleted()) { ```xml ecommerce - common-ecommerce-common + common-ecommerce-shared ecommerce - common-ecommerce-core + common-ecommerce-channel ecommerce diff --git a/README.md b/README.md index 515e815..90b475d 100644 --- a/README.md +++ b/README.md @@ -7,35 +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-common` | **跨域共享层**:异常体系、SPI 契约、幂等、审计、水位线、通用值对象(Money / Page / PlatformTime / 枚举)。不依赖任何领域模块 | -| `common-ecommerce-core` | 渠道域:领域模型、能力接口、门面、同步管道。依赖 `common` | -| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码。依赖 `common`,**不依赖 `core`** | +| `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 生成访问器 | 依赖方向: ``` -core ─┐ -http ─┼──→ common +channel ─┐ +http ────┼──→ shared testkit ─┘ -lingxing ──→ core, http, common +lingxing ──→ channel, http, shared ``` -渠道域与未来的仓库域平级,互不依赖,只共享 `common`。`http` 不依赖 `core`,仓库域可以直接复用传输层与令牌管理。 +渠道域与未来的仓库域平级,互不依赖,只共享 `shared`。`http` 不依赖 `channel`,仓库域可以直接复用传输层与令牌管理。 **Lombok 使用范围**:仅 `lingxing` 模块的 `dto/*`,`scope=provided`,不进宿主运行时。 -`core` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限, -而 `core` 要尽量少依赖编译期工具。 +`channel` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限, +而 `channel` 要尽量少依赖编译期工具。 ## 构建 @@ -54,25 +143,46 @@ mvn clean test ``` 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 统一异常体系 +│ ├── spi AccessToken / TokenStore / LockProvider / IdempotencyStore / SyncCursorStore … +│ ├── idempotency 写操作双锁幂等守卫 +│ ├── audit CallObserver / CallRecord +│ ├── sync SyncSpec / SyncResult +│ └── support Money / PlatformTime / Page / CanonicalKeys +├── channel 渠道域(channel) +│ ├── model 领域模型 +│ │ ├── account AccountKey / ChannelAccount +│ │ ├── order SalesOrder / OrderLine / Query / Ref +│ │ ├── product ProductListing / Query / Ref / SearchField / SyncStrategy +│ │ ├── fulfillment OutboundOrder / OutboundPackage / ShippingLabel / OrderEdit / ShipmentReview +│ │ ├── aftersale AfterSale / Query / Type +│ │ └── settlement SettlementQuery / SettlementTransaction +│ ├── capability 能力接口,适配器实现这些 +│ ├── sdk 门面、上下文、适配器工厂接口 +│ ├── sync 同步引擎 +│ └── spi ChannelAccountRepository / Sink +├── http HTTP 传输、JSON、签名、令牌(http) +├── testkit 测试替身与夹具(testkit) +└── lingxing 领星适配器(lingxing) ``` 包名统一前缀 `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。 @@ -80,31 +190,34 @@ 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` | +| `shared.model` | **枚举**:`Platform` / `ChannelProvider` / `Capability` / `FulfillmentMode` | +| `channel.model.account` | `AccountKey` / `ChannelAccount` | +| `channel.model.order` | `SalesOrder` / `OrderLine` / `SalesOrderQuery` / `SalesOrderRef` | +| `channel.model.product` | `ProductListing` / `ProductQuery` / `ProductRef` / `ProductSearchField` / `ProductSyncStrategy` | +| `channel.model.fulfillment` | `OutboundOrder` / `OutboundPackage` / `ShippingLabel` / `OrderEditRequest` / `ShipmentReviewResult` … | +| `channel.model.aftersale` | `AfterSale` / `AfterSaleQuery` / `AfterSaleType` | +| `channel.model.settlement` | `SettlementQuery` / `SettlementTransaction` | +| `shared.support` | `Money` / `PlatformTime` / `Page` / `CanonicalKeys` | | 类 | 包袱 | 职责 | |:---|:---|:---| -| `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`,不静默返回空。 @@ -114,10 +227,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`。 @@ -138,39 +252,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(加密) | @@ -178,7 +294,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` —— 出入网层 @@ -204,14 +320,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` | 工厂注册 | --- @@ -248,9 +414,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) 适合需要自己控制时间窗、翻页与落库的场景。 @@ -262,24 +429,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() @@ -338,7 +506,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"); @@ -421,9 +589,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 步:实现能力接口**。只实现真正支持的,其余不实现: @@ -509,9 +677,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 不许私起线程 | | 能力声明与实际实现不一致 | 验收项,缺失能力必须显式抛异常 | @@ -538,20 +706,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")) @@ -566,12 +735,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(); // 双锁幂等:第二次调用回放,平台只真正写一次 @@ -587,7 +756,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/core/pom.xml b/channel/pom.xml similarity index 89% rename from core/pom.xml rename to channel/pom.xml index afb6438..51a861e 100644 --- a/core/pom.xml +++ b/channel/pom.xml @@ -10,13 +10,13 @@ 1.0.0-SNAPSHOT - common-ecommerce-core + common-ecommerce-channel 渠道域:领域模型、能力接口、门面、同步管道(无平台代码) ecommerce - common-ecommerce-common + common-ecommerce-shared org.slf4j 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 95% rename from core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java rename to channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java index cae24ac..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.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +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 69% rename from core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java index 44c4563..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.shared.error.ChannelException; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; +import common.ecommerce.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.sdk.ChannelContext; +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 89% rename from core/src/main/java/common/ecommerce/capability/AfterSales.java rename to channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java index b4bfb25..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.shared.audit.CallObserver; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; +import common.ecommerce.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +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 98% rename from core/src/main/java/common/ecommerce/capability/AggregatorCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java index df80f28..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.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.shared.model.Platform; -import common.ecommerce.sdk.ChannelContext; +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 93% rename from core/src/main/java/common/ecommerce/capability/CapabilityReport.java rename to channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java index 042fd27..cfa1c02 100644 --- a/core/src/main/java/common/ecommerce/capability/CapabilityReport.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java @@ -1,4 +1,4 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; import common.ecommerce.shared.model.Capability; 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 77% rename from core/src/main/java/common/ecommerce/capability/OrderEditCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java index 1c1cacd..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.shared.model.Capability; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; -import common.ecommerce.sdk.ChannelContext; +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 69% rename from core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java index d3f6409..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.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; import common.ecommerce.shared.support.Page; -import common.ecommerce.sdk.ChannelContext; +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 93% rename from core/src/main/java/common/ecommerce/capability/Outbounds.java rename to channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java index 167ba97..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; +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.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.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +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 92% rename from core/src/main/java/common/ecommerce/capability/PlatformAdapter.java rename to channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java index aae7bfa..8637ce0 100644 --- a/core/src/main/java/common/ecommerce/capability/PlatformAdapter.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java @@ -1,7 +1,7 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; 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 77% rename from core/src/main/java/common/ecommerce/capability/ProductCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java index ac6f7b2..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.shared.model.Capability; import common.ecommerce.shared.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductRef; -import common.ecommerce.model.product.ProductSyncStrategy; -import common.ecommerce.sdk.ChannelContext; +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 89% rename from core/src/main/java/common/ecommerce/capability/Products.java rename to channel/src/main/java/common/ecommerce/channel/capability/Products.java index d5e0b46..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.shared.audit.CallObserver; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.shared.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.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 83% rename from core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java index 1412ace..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.shared.error.ChannelException; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.order.SalesOrderRef; +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.sdk.ChannelContext; +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 93% rename from core/src/main/java/common/ecommerce/capability/SalesOrders.java rename to channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java index 49a407a..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; +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.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.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +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 72% rename from core/src/main/java/common/ecommerce/capability/SettlementCapable.java rename to channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java index 1a5d032..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.channel.model.settlement.SettlementQuery; +import common.ecommerce.channel.model.settlement.SettlementTransaction; import common.ecommerce.shared.support.Page; -import common.ecommerce.sdk.ChannelContext; +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 90% rename from core/src/main/java/common/ecommerce/capability/Settlements.java rename to channel/src/main/java/common/ecommerce/channel/capability/Settlements.java index 5132ec8..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.shared.audit.CallObserver; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.settlement.SettlementQuery; -import common.ecommerce.model.settlement.SettlementTransaction; +import common.ecommerce.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.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +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 98% 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 de08c83..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,4 +1,4 @@ -package common.ecommerce.model.account; +package common.ecommerce.channel.model.account; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; 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 99% 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 4a2caaa..b13ed24 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,4 +1,4 @@ -package common.ecommerce.model.account; +package common.ecommerce.channel.model.account; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; 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 99% 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 0a3d62a..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,4 +1,4 @@ -package common.ecommerce.model.aftersale; +package common.ecommerce.channel.model.aftersale; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; 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 554499d..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,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.support.Money; 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 98% 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 cbce658..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,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import common.ecommerce.shared.support.Money; 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 99% 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 76d3932..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,4 +1,4 @@ -package common.ecommerce.model.fulfillment; +package common.ecommerce.channel.model.fulfillment; import common.ecommerce.shared.model.ChannelProvider; 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 98% 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 0ac34c5..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,4 +1,4 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.model.order; import common.ecommerce.shared.support.Money; 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 99% 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 37d064c..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,4 +1,4 @@ -package common.ecommerce.model.order; +package common.ecommerce.channel.model.order; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.support.Money; 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 99% 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 fc814dc..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,4 +1,4 @@ -package common.ecommerce.model.product; +package common.ecommerce.channel.model.product; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; 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 99% 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 2fc80e3..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,4 +1,4 @@ -package common.ecommerce.model.settlement; +package common.ecommerce.channel.model.settlement; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.support.Money; 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 91% rename from core/src/main/java/common/ecommerce/sdk/AdapterFactory.java rename to channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java index c7f0aa2..d85aefc 100644 --- a/core/src/main/java/common/ecommerce/sdk/AdapterFactory.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.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; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; @@ -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 99% rename from core/src/main/java/common/ecommerce/sdk/CallSupport.java rename to channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java index ad652e6..ba36c52 100644 --- a/core/src/main/java/common/ecommerce/sdk/CallSupport.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java @@ -1,4 +1,4 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.sdk; import common.ecommerce.shared.audit.CallObserver; import common.ecommerce.shared.audit.CallOutcome; 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 98% rename from core/src/main/java/common/ecommerce/sdk/ChannelConnection.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java index d39c79e..ffde622 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelConnection.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java @@ -1,4 +1,4 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.sdk; import common.ecommerce.shared.spi.ChannelSecret; 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 97% rename from core/src/main/java/common/ecommerce/sdk/ChannelContext.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java index 910f662..c18325f 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelContext.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java @@ -1,7 +1,7 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.sdk; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; +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; 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 96% rename from core/src/main/java/common/ecommerce/sdk/ChannelSdk.java rename to channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java index 1baa685..cc7e411 100644 --- a/core/src/main/java/common/ecommerce/sdk/ChannelSdk.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java @@ -1,24 +1,24 @@ -package common.ecommerce.sdk; +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.capability.AdapterCapabilityReport; -import common.ecommerce.capability.AfterSales; -import common.ecommerce.capability.AggregatorCapable; +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.capability.CapabilityReport; -import common.ecommerce.capability.PlatformAdapter; -import common.ecommerce.capability.Products; -import common.ecommerce.capability.SalesOrders; -import common.ecommerce.capability.Outbounds; -import common.ecommerce.capability.Settlements; +import common.ecommerce.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.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.spi.ChannelAccountRepository; -import common.ecommerce.sdk.AdapterFactory.AdapterConfig; +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; 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 82% rename from core/src/main/java/common/ecommerce/spi/Sink.java rename to channel/src/main/java/common/ecommerce/channel/spi/Sink.java index 0a6682b..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.shared.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.order.SalesOrder; +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 94% rename from core/src/main/java/common/ecommerce/sync/SyncEngine.java rename to channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java index 7c56610..64114a9 100644 --- a/core/src/main/java/common/ecommerce/sync/SyncEngine.java +++ b/channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java @@ -1,11 +1,11 @@ -package common.ecommerce.sync; +package common.ecommerce.channel.sync; import common.ecommerce.shared.support.Page; import common.ecommerce.shared.sync.SyncResult; import common.ecommerce.shared.sync.SyncSpec; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.spi.Sink; +import common.ecommerce.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 93% rename from core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java rename to channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java index b6b584b..23fac4d 100644 --- a/core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java +++ b/channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; import common.ecommerce.shared.audit.CallObserver; import common.ecommerce.shared.audit.CallOutcome; @@ -7,13 +7,13 @@ import common.ecommerce.shared.error.PlatformBusinessException; import common.ecommerce.shared.model.Capability; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.OrderEditRequest; -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.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; 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 94% rename from core/src/test/java/common/ecommerce/sdk/CallObserverTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java index dda2f54..4760f85 100644 --- a/core/src/test/java/common/ecommerce/sdk/CallObserverTest.java +++ b/channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.sdk; +package common.ecommerce.channel.sdk; import common.ecommerce.shared.audit.CallObserver; import common.ecommerce.shared.audit.CallOutcome; @@ -6,11 +6,11 @@ import common.ecommerce.shared.audit.CallRecord; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.product.ProductQuery; +import common.ecommerce.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; 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 94% rename from core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java index 09d1c60..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; +package common.ecommerce.channel.sdk; -import common.ecommerce.capability.CapabilityReport; -import common.ecommerce.capability.PlatformAdapter; +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.model.account.AccountKey; +import common.ecommerce.channel.model.account.AccountKey; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.account.ChannelAccount; +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.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.spi.ChannelAccountRepository; +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; @@ -40,7 +40,7 @@ class ChannelSdkTest { 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 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 96% rename from core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java rename to channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java index 4d02d8a..9b63680 100644 --- a/core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java +++ b/channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java @@ -1,17 +1,17 @@ -package common.ecommerce.sdk; +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.capability.CapabilityReport; +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.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +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; @@ -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 2fcce00..16eb6a0 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -16,7 +16,7 @@ ecommerce - common-ecommerce-common + common-ecommerce-shared com.squareup.okhttp3 diff --git a/lingxing/pom.xml b/lingxing/pom.xml index 7b6dd98..7a4d298 100644 --- a/lingxing/pom.xml +++ b/lingxing/pom.xml @@ -16,11 +16,11 @@ ecommerce - common-ecommerce-common + common-ecommerce-shared ecommerce - common-ecommerce-core + common-ecommerce-channel ecommerce 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 cb952ad..8a48ed7 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java @@ -1,15 +1,15 @@ package common.ecommerce.lingxing.adapter; -import common.ecommerce.capability.AfterSaleCapable; -import common.ecommerce.capability.AggregatorCapable; -import common.ecommerce.capability.OrderEditCapable; -import common.ecommerce.capability.OutboundCapable; -import common.ecommerce.capability.OutboundOrderCapable; -import common.ecommerce.capability.ProductCapable; -import common.ecommerce.capability.SalesOrderCapable; -import common.ecommerce.capability.SettlementCapable; -import common.ecommerce.capability.ShipmentReviewCapable; -import common.ecommerce.capability.ShippingLabelCapable; +import common.ecommerce.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.http.HttpTransport; @@ -36,29 +36,29 @@ import common.ecommerce.lingxing.platform.wms.WmsOutboundOrderSource; import common.ecommerce.shared.model.Capability; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -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.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.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.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.sdk.ChannelContext; +import common.ecommerce.channel.sdk.ChannelContext; import common.ecommerce.shared.spi.AccessToken; import common.ecommerce.shared.spi.ChannelSecret; import common.ecommerce.shared.spi.LockProvider; 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 0e26e01..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,10 +1,10 @@ package common.ecommerce.lingxing.adapter; import common.ecommerce.lingxing.LingxingConstants; -import common.ecommerce.capability.PlatformAdapter; +import common.ecommerce.channel.capability.PlatformAdapter; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.sdk.AdapterFactory; +import common.ecommerce.channel.sdk.AdapterFactory; import common.ecommerce.shared.spi.LockProvider; import common.ecommerce.shared.spi.TokenStore; import com.fasterxml.jackson.databind.ObjectMapper; 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 17b4cd5..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,7 +2,7 @@ package common.ecommerce.lingxing.http; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.JacksonJsonCodec; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.sdk.ChannelContext; import common.ecommerce.shared.spi.AccessToken; import common.ecommerce.shared.spi.ChannelSecret; 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 b9ff416..cd5686c 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java @@ -6,8 +6,8 @@ import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.shared.model.ChannelProvider; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; +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; 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 9184d01..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,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; +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 1258a3f..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,7 +7,7 @@ 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.channel.sdk.ChannelContext; import common.ecommerce.shared.spi.AccessToken; import common.ecommerce.shared.spi.ChannelSecret; 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 5f53d67..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,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +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; 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 eba4b24..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,7 +1,7 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; +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 09f0736..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,8 +1,8 @@ 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.channel.model.product.ProductListing; +import common.ecommerce.channel.model.product.ProductQuery; import common.ecommerce.shared.support.Page; /** 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 3d5e3f7..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,8 +1,8 @@ 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.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/aftersale/LingxingAfterSaleListSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java index e3456a8..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,9 +7,9 @@ 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.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; 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 9659dd9..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 @@ -4,8 +4,8 @@ import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto; import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleItemDto; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleType; +import common.ecommerce.channel.model.aftersale.AfterSale; +import common.ecommerce.channel.model.aftersale.AfterSaleType; import common.ecommerce.shared.support.Money; import common.ecommerce.shared.support.PlatformTime; 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 1abadcc..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 7548aa6..109ca9e 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 @@ -16,10 +16,10 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.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; 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 ff28384..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 @@ -15,10 +15,10 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.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; 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 5bfe0ea..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 2236090..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; 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 af00fe2..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 @@ -12,9 +12,9 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonSettlementTransactionDto; import common.ecommerce.lingxing.platform.LingxingSettlementSource; import common.ecommerce.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.settlement.SettlementQuery; -import common.ecommerce.model.settlement.SettlementTransaction; +import common.ecommerce.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; 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 fd35fee..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 @@ -18,10 +18,10 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.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; 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 a833d3d..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 @@ -8,9 +8,9 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.amazon.vc.dto.AmazonVcListingDto; import common.ecommerce.lingxing.platform.LingxingProductSource; import common.ecommerce.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +import common.ecommerce.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; 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 180f781..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; 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 7db7803..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 bfff93e..bae597b 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 @@ -13,9 +13,9 @@ 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.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; 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 18242f2..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; @@ -10,7 +10,7 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.multiplatform.dto.MultiPlatformShopDto; import common.ecommerce.lingxing.platform.LingxingShopSource; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.ChannelAccount; +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/product/SheinProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java index fd87ed9..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 efe605a..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; @@ -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/product/TemuProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java index 0880ed6..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 041b340..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 @@ -9,13 +9,13 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +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; 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 0944d94..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 @@ -10,14 +10,14 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +import common.ecommerce.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; 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 13fd069..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 @@ -11,9 +11,9 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingOrderEditSource; import common.ecommerce.lingxing.platform.wms.dto.OrderEditErrorDto; import common.ecommerce.shared.model.ChannelProvider; -import common.ecommerce.model.fulfillment.DeclaredItem; -import common.ecommerce.model.fulfillment.OrderEditRequest; -import common.ecommerce.model.fulfillment.OrderEditResult; +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 77f9c73..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 @@ -14,7 +14,7 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.fulfillment.ShipmentReviewResult; +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 b8f5b20..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 @@ -11,8 +11,8 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingLabelSource; import common.ecommerce.lingxing.platform.wms.dto.WmsLogisticsLabelDto; import common.ecommerce.shared.model.ChannelProvider; -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.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 bedad43..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 @@ -14,10 +14,10 @@ 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.shared.model.ChannelProvider; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderLine; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.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; 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 be408cf..3f2e434 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java @@ -9,18 +9,18 @@ import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.support.LingxingTestSupport; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; +import common.ecommerce.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; import common.ecommerce.shared.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.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 c0b09c6..c7b6c7d 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; @@ -10,28 +10,28 @@ 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.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderLine; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; -import common.ecommerce.model.fulfillment.ShippingLabel; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.order.SalesOrderRef; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.settlement.SettlementQuery; -import common.ecommerce.model.settlement.SettlementTransaction; +import common.ecommerce.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +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.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; import org.junit.jupiter.api.Test; import java.time.Clock; @@ -194,7 +194,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 (common.ecommerce.model.order.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() @@ -248,7 +248,7 @@ class LingxingLiveSmokeTest { + " status=" + detail.status() + " total=" + detail.totalAmount() + " lines=" + detail.lines().size()); - for (common.ecommerce.model.order.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 2767d11..6d63df2 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingSdkListingCallTest.java @@ -7,19 +7,19 @@ import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.support.LingxingTestSupport; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; +import common.ecommerce.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; import common.ecommerce.shared.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.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; 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 9080577..51cd126 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java @@ -4,10 +4,10 @@ import common.ecommerce.http.HttpRequest; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.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; 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 ee24753..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 @@ -4,13 +4,13 @@ import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.aftersale.AfterSaleType; +import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 008ee8f..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 @@ -4,8 +4,8 @@ import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleType; +import common.ecommerce.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 2728d7c..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.aliexpress.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 01231cc..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.amazon.sc.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 8791c65..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.amazon.vc.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 428f388..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 @@ -3,13 +3,13 @@ package common.ecommerce.lingxing.platform.ebay.product; import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 960593e..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.shein.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 7654dd8..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.target.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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/temu/product/TemuProductSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSourceTest.java index 50bdbf2..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.temu.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 2cc6d22..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 @@ -2,13 +2,13 @@ package common.ecommerce.lingxing.platform.tiktok.product; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 ce291f9..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 @@ -3,14 +3,14 @@ package common.ecommerce.lingxing.platform.walmart.product; import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; -import common.ecommerce.model.product.ProductStatus; +import common.ecommerce.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.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +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 0438ad1..91655a3 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ListingParamProbeTest.java @@ -14,10 +14,10 @@ import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.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; 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 a204a1f..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; @@ -10,19 +10,19 @@ import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.adapter.LingxingAdapter; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductSearchField; +import common.ecommerce.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.sdk.ChannelSdk; +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.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +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 a2a6aff..441cf38 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/SearchFieldProbeTest.java @@ -11,10 +11,10 @@ import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.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; 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 9520383..1e72399 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/ShopListProbeTest.java @@ -13,10 +13,10 @@ import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.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; 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 30a9443..d002e64 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/support/LingxingTestSupport.java @@ -8,13 +8,13 @@ import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.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.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.RecordingTransport; import java.time.Clock; import java.time.Instant; diff --git a/pom.xml b/pom.xml index d3005c0..7386c9d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,8 @@ - common - core + shared + channel http testkit lingxing @@ -37,12 +37,12 @@ ecommerce - common-ecommerce-common + common-ecommerce-shared ${project.version} ecommerce - common-ecommerce-core + common-ecommerce-channel ${project.version} diff --git a/common/pom.xml b/shared/pom.xml similarity index 95% rename from common/pom.xml rename to shared/pom.xml index 7f70c4a..d2d6bc8 100644 --- a/common/pom.xml +++ b/shared/pom.xml @@ -10,7 +10,7 @@ 1.0.0-SNAPSHOT - common-ecommerce-common + common-ecommerce-shared 跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。 不依赖任何领域模块,供渠道域(core)与仓库域复用。 diff --git a/common/src/main/java/common/ecommerce/shared/audit/CallObserver.java b/shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/audit/CallObserver.java rename to shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java diff --git a/common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java b/shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java rename to shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java diff --git a/common/src/main/java/common/ecommerce/shared/audit/CallRecord.java b/shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/audit/CallRecord.java rename to shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java diff --git a/common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java b/shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java rename to shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java diff --git a/common/src/main/java/common/ecommerce/shared/error/AuthException.java b/shared/src/main/java/common/ecommerce/shared/error/AuthException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/AuthException.java rename to shared/src/main/java/common/ecommerce/shared/error/AuthException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/ChannelException.java b/shared/src/main/java/common/ecommerce/shared/error/ChannelException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/ChannelException.java rename to shared/src/main/java/common/ecommerce/shared/error/ChannelException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java b/shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java rename to shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java b/shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java rename to shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java b/shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java rename to shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/RateLimitException.java b/shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/RateLimitException.java rename to shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/TransientException.java b/shared/src/main/java/common/ecommerce/shared/error/TransientException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/TransientException.java rename to shared/src/main/java/common/ecommerce/shared/error/TransientException.java diff --git a/common/src/main/java/common/ecommerce/shared/error/ValidationException.java b/shared/src/main/java/common/ecommerce/shared/error/ValidationException.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/error/ValidationException.java rename to shared/src/main/java/common/ecommerce/shared/error/ValidationException.java diff --git a/common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java b/shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java rename to shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java diff --git a/common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java b/shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java rename to shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java diff --git a/common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java b/shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java rename to shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java diff --git a/common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java b/shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java rename to shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java diff --git a/common/src/main/java/common/ecommerce/shared/model/Capability.java b/shared/src/main/java/common/ecommerce/shared/model/Capability.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/model/Capability.java rename to shared/src/main/java/common/ecommerce/shared/model/Capability.java diff --git a/common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java b/shared/src/main/java/common/ecommerce/shared/model/ChannelProvider.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java rename to shared/src/main/java/common/ecommerce/shared/model/ChannelProvider.java diff --git a/common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java b/shared/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java rename to shared/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java diff --git a/common/src/main/java/common/ecommerce/shared/model/Platform.java b/shared/src/main/java/common/ecommerce/shared/model/Platform.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/model/Platform.java rename to shared/src/main/java/common/ecommerce/shared/model/Platform.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/AccessToken.java b/shared/src/main/java/common/ecommerce/shared/spi/AccessToken.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/AccessToken.java rename to shared/src/main/java/common/ecommerce/shared/spi/AccessToken.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java b/shared/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java rename to shared/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java b/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java rename to shared/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java b/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java rename to shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java b/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java rename to shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java b/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java rename to shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/LockProvider.java b/shared/src/main/java/common/ecommerce/shared/spi/LockProvider.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/LockProvider.java rename to shared/src/main/java/common/ecommerce/shared/spi/LockProvider.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java b/shared/src/main/java/common/ecommerce/shared/spi/SecretProvider.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java rename to shared/src/main/java/common/ecommerce/shared/spi/SecretProvider.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java b/shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java rename to shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java diff --git a/common/src/main/java/common/ecommerce/shared/spi/TokenStore.java b/shared/src/main/java/common/ecommerce/shared/spi/TokenStore.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/spi/TokenStore.java rename to shared/src/main/java/common/ecommerce/shared/spi/TokenStore.java diff --git a/common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java b/shared/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java rename to shared/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java diff --git a/common/src/main/java/common/ecommerce/shared/support/Money.java b/shared/src/main/java/common/ecommerce/shared/support/Money.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/support/Money.java rename to shared/src/main/java/common/ecommerce/shared/support/Money.java diff --git a/common/src/main/java/common/ecommerce/shared/support/Page.java b/shared/src/main/java/common/ecommerce/shared/support/Page.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/support/Page.java rename to shared/src/main/java/common/ecommerce/shared/support/Page.java diff --git a/common/src/main/java/common/ecommerce/shared/support/PlatformTime.java b/shared/src/main/java/common/ecommerce/shared/support/PlatformTime.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/support/PlatformTime.java rename to shared/src/main/java/common/ecommerce/shared/support/PlatformTime.java diff --git a/common/src/main/java/common/ecommerce/shared/sync/SyncResult.java b/shared/src/main/java/common/ecommerce/shared/sync/SyncResult.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/sync/SyncResult.java rename to shared/src/main/java/common/ecommerce/shared/sync/SyncResult.java diff --git a/common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java b/shared/src/main/java/common/ecommerce/shared/sync/SyncSpec.java similarity index 100% rename from common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java rename to shared/src/main/java/common/ecommerce/shared/sync/SyncSpec.java diff --git a/common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java b/shared/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java similarity index 100% rename from common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java rename to shared/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java diff --git a/common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java b/shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java similarity index 100% rename from common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java rename to shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java diff --git a/common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java b/shared/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java similarity index 100% rename from common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java rename to shared/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java diff --git a/testkit/pom.xml b/testkit/pom.xml index 26cab42..eed9411 100644 --- a/testkit/pom.xml +++ b/testkit/pom.xml @@ -16,11 +16,11 @@ ecommerce - common-ecommerce-common + common-ecommerce-shared ecommerce - common-ecommerce-core + 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 90% rename from testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java index 9087871..c19b577 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/FakeDirectAdapter.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java @@ -1,31 +1,31 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.capability.AfterSaleCapable; -import common.ecommerce.capability.ProductCapable; -import common.ecommerce.capability.SalesOrderCapable; +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.model.account.AccountKey; +import common.ecommerce.channel.model.account.AccountKey; import common.ecommerce.shared.model.Capability; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.aftersale.AfterSaleType; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.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.model.order.OrderLine; +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.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.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; 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 92% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java index 26673d0..5990249 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryAccounts.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java @@ -1,8 +1,8 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.spi.ChannelAccountRepository; +import common.ecommerce.channel.spi.ChannelAccountRepository; import common.ecommerce.shared.spi.ChannelSecret; -import common.ecommerce.model.account.ChannelAccount; +import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.shared.spi.SecretProvider; import java.util.ArrayList; 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 96% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java index d9f5dcd..8d4fe9b 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryCursorStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.spi.SyncCursorStore; 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 99% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java index c10d289..eaa5587 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryIdempotencyStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.shared.model.ChannelProvider; import common.ecommerce.shared.spi.IdempotencyClaim; 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 97% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java index 156dc19..eda5111 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryLockProvider.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.shared.spi.LockProvider; 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 85% rename from testkit/src/main/java/common/ecommerce/testkit/InMemorySink.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java index 73806c2..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.shared.support.Page; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.spi.Sink; +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 95% rename from testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java index 5bb523c..c5ddb21 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/InMemoryTokenStore.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java @@ -1,4 +1,4 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.shared.spi.AccessToken; import common.ecommerce.shared.spi.TokenStore; 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 90% rename from testkit/src/main/java/common/ecommerce/testkit/TestData.java rename to testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java index e41bee0..4433d65 100644 --- a/testkit/src/main/java/common/ecommerce/testkit/TestData.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java @@ -1,7 +1,7 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; import common.ecommerce.shared.support.Page; -import common.ecommerce.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrder; import common.ecommerce.shared.spi.SyncCursorStore; import java.time.Duration; 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 97% rename from testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java rename to testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java index 5d408c2..6ca8875 100644 --- a/testkit/src/test/java/common/ecommerce/idempotency/IdempotencyGuardTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java @@ -9,8 +9,8 @@ import common.ecommerce.shared.idempotency.IdempotencyGuard; import common.ecommerce.shared.idempotency.WriteResult; import common.ecommerce.shared.idempotency.WriteScope; import common.ecommerce.shared.spi.IdempotencyStatus; -import common.ecommerce.testkit.InMemoryIdempotencyStore; -import common.ecommerce.testkit.MutableClock; +import common.ecommerce.shared.testkit.InMemoryIdempotencyStore; +import common.ecommerce.shared.testkit.MutableClock; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -190,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 89% rename from testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java rename to testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java index 19704f9..3e21cc1 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/FakeDirectAdapterTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java @@ -1,20 +1,20 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.capability.AdapterCapabilityReport; -import common.ecommerce.capability.CapabilityReport; +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.model.account.ChannelAccount; +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.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.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; 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 86% rename from testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java rename to testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java index 72e1b67..3ed0150 100644 --- a/testkit/src/test/java/common/ecommerce/testkit/SdkFacadeCallTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java @@ -1,23 +1,23 @@ -package common.ecommerce.testkit; +package common.ecommerce.shared.testkit; -import common.ecommerce.capability.CapabilityReport; +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.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.aftersale.AfterSaleType; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; +import common.ecommerce.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.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; import common.ecommerce.shared.spi.ChannelSecret; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -103,7 +103,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()); @@ -160,7 +160,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..81f4d1a 100644 --- a/操作手册.md +++ b/操作手册.md @@ -27,7 +27,7 @@ ```xml ecommerce - common-ecommerce-core + common-ecommerce-channel 1.0.0-SNAPSHOT