Browse Source

refactor: 模块更名 shared/channel,README 补架构图

- common → shared(跨域共享层),core → channel(渠道域),
  包名同步为 common.ecommerce.shared.* / common.ecommerce.channel.*
- GUIDE / 操作手册 的 Maven 坐标随之更新
- README 增加架构图:分层依赖、模块依赖、一次查询的调用链;
  包职责表与 lingxing 适配器结构对齐当前实现

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 2 weeks ago
parent
commit
8bca2bff73
  1. 4
      GUIDE.md
  2. 333
      README.md
  3. 4
      channel/pom.xml
  4. 4
      channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java
  5. 10
      channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java
  6. 12
      channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java
  7. 6
      channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java
  8. 2
      channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java
  9. 8
      channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java
  10. 8
      channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java
  11. 8
      channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java
  12. 22
      channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java
  13. 4
      channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java
  14. 12
      channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java
  15. 14
      channel/src/main/java/common/ecommerce/channel/capability/Products.java
  16. 10
      channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java
  17. 18
      channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java
  18. 8
      channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java
  19. 12
      channel/src/main/java/common/ecommerce/channel/capability/Settlements.java
  20. 6
      channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java
  21. 8
      channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java
  22. 2
      channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java
  23. 2
      channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java
  24. 2
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java
  25. 2
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java
  26. 2
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java
  27. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java
  28. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java
  29. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java
  30. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java
  31. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java
  32. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java
  33. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java
  34. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java
  35. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java
  36. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java
  37. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java
  38. 2
      channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java
  39. 2
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java
  40. 2
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java
  41. 4
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java
  42. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java
  43. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java
  44. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java
  45. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java
  46. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java
  47. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java
  48. 2
      channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java
  49. 2
      channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java
  50. 8
      channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java
  51. 2
      channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java
  52. 2
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java
  53. 6
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java
  54. 28
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java
  55. 6
      channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java
  56. 4
      channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java
  57. 6
      channel/src/main/java/common/ecommerce/channel/spi/Sink.java
  58. 8
      channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java
  59. 16
      channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java
  60. 12
      channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java
  61. 24
      channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java
  62. 14
      channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java
  63. 2
      http/pom.xml
  64. 4
      lingxing/pom.xml
  65. 64
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
  66. 4
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
  67. 2
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
  68. 4
      lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
  69. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
  70. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
  71. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java
  72. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java
  73. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
  74. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
  75. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java
  76. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java
  77. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java
  78. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java
  79. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java
  80. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java
  81. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java
  82. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java
  83. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java
  84. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java
  85. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java
  86. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java
  87. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java
  88. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/order/VcOrderSource.java
  89. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
  90. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java
  91. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java
  92. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/LingxingOrderFilters.java
  93. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java
  94. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/outbound/MultiPlatformOutboundSource.java
  95. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java
  96. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java
  97. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java
  98. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java
  99. 10
      lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java
  100. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
  101. Some files were not shown because too many files have changed in this diff Show More

4
GUIDE.md

@ -381,11 +381,11 @@ if (r.alreadyCompleted()) { @@ -381,11 +381,11 @@ if (r.alreadyCompleted()) {
```xml
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-core</artifactId>
<artifactId>common-ecommerce-channel</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>

333
README.md

@ -7,35 +7,124 @@ @@ -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 实现<br/>MySQL · Redis/Redisson · KMS"]
end
subgraph SDK["common-ecommerce"]
FACADE["channel · 门面<br/>ChannelSdk · 能力视图<br/>SalesOrders / Products / Outbounds / AfterSales / Settlements"]
CAP["channel · 能力接口<br/>PlatformAdapter · SalesOrderCapable · ProductCapable …"]
CMODEL["channel · 领域模型<br/>SalesOrder · ProductListing · AccountKey · Page"]
ENGINE["channel · 同步管道<br/>SyncEngine"]
SHARED["shared · 跨域共享层<br/>异常 · 幂等 · 审计 · 枚举 · SPI 定义 · Money/Page"]
HTTPM["http · 出入网层<br/>HttpTransport · Signer · TokenManager · JsonCodec"]
LX["lingxing · 聚合适配器<br/>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<br/>common-ecommerce-shared"]
channel["channel<br/>common-ecommerce-channel"]
http["http<br/>common-ecommerce-http"]
testkit["testkit<br/>common-ecommerce-testkit"]
lingxing["lingxing<br/>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<ProductListing>
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 @@ -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 @@ -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<T>` | 载体 | 分页载体,`nextCursor == null` 表示结束 |
| `Page<T>` | 载体(shared) | 分页载体,`nextCursor == null` 表示结束 |
### `capability` —— 能力接口
### `channel.capability` —— 能力接口
适配器实现哪些接口就声明哪些能力;未实现的方法抛 `UnsupportedCapabilityException`,不静默返回空。
@ -114,10 +227,11 @@ common.ecommerce @@ -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 @@ -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 @@ -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 @@ -204,14 +320,64 @@ common.ecommerce
### `lingxing` —— 领星适配器
一个聚合器适配器覆盖多个业务平台:`AccountKey.platform` 决定分派到哪个子平台实现,
子平台再按需组合订单 / 商品 / 店铺 / 结算 / 售后 / 出库各路 Source。
```mermaid
graph TD
A["LingxingAdapter<br/>聚合器门面 · 能力按子平台细化"]
R["LingxingSubPlatforms<br/>子平台注册表(按适配器实例)"]
C["LingxingCall<br/>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(全平台共用)<br/>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 @@ -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 @@ -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<SalesOrder> page = adapter.pull(ctx, SalesOrderQuery.builder()
@ -338,7 +506,7 @@ ChannelSdk sdk = ChannelSdk.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 @@ -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 @@ -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 @@ -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<SalesOrder> 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")); @@ -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()); @@ -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
```
---

4
core/pom.xml → channel/pom.xml

@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-ecommerce-core</artifactId>
<artifactId>common-ecommerce-channel</artifactId>
<description>渠道域:领域模型、能力接口、门面、同步管道(无平台代码)</description>
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

4
core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java → channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java

@ -1,7 +1,7 @@ @@ -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;

10
core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java → channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java

@ -1,12 +1,12 @@ @@ -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;
/**
* 售后能力:拉取售后订单(退款 / 退货 / 换货)。

12
core/src/main/java/common/ecommerce/capability/AfterSales.java → channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java

@ -1,14 +1,14 @@ @@ -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;
/**
* 门面持有的售后视图。调用前做能力检查,缺失时显式拒绝。

6
core/src/main/java/common/ecommerce/capability/AggregatorCapable.java → channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java

@ -1,9 +1,9 @@ @@ -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;

2
core/src/main/java/common/ecommerce/capability/CapabilityReport.java → channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.capability;
package common.ecommerce.channel.capability;
import common.ecommerce.shared.model.Capability;

8
core/src/main/java/common/ecommerce/capability/OrderEditCapable.java → channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java

@ -1,9 +1,9 @@ @@ -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;

8
core/src/main/java/common/ecommerce/capability/OutboundCapable.java → channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java

@ -1,8 +1,8 @@ @@ -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;

8
core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java → channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java

@ -1,9 +1,9 @@ @@ -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;
/**
* 销售出库单(仓库出库单据)查询能力。

22
core/src/main/java/common/ecommerce/capability/Outbounds.java → channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java

@ -1,20 +1,20 @@ @@ -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;

4
core/src/main/java/common/ecommerce/capability/PlatformAdapter.java → channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java

@ -1,7 +1,7 @@ @@ -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;

12
core/src/main/java/common/ecommerce/capability/ProductCapable.java → channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java

@ -1,12 +1,12 @@ @@ -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 能力。

14
core/src/main/java/common/ecommerce/capability/Products.java → channel/src/main/java/common/ecommerce/channel/capability/Products.java

@ -1,15 +1,15 @@ @@ -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 {

10
core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java → channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java

@ -1,12 +1,12 @@ @@ -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 销售订单能力:消费者订单。

18
core/src/main/java/common/ecommerce/capability/SalesOrders.java → channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java

@ -1,18 +1,18 @@ @@ -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;

8
core/src/main/java/common/ecommerce/capability/SettlementCapable.java → channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java

@ -1,9 +1,9 @@ @@ -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;
/**
* 结算 / 账单能力:拉取平台结算交易明细。

12
core/src/main/java/common/ecommerce/capability/Settlements.java → channel/src/main/java/common/ecommerce/channel/capability/Settlements.java

@ -1,14 +1,14 @@ @@ -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;
/**
* 门面持有的结算视图。调用前做能力检查,缺失时显式拒绝。

6
core/src/main/java/common/ecommerce/capability/ShipmentReviewCapable.java → channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java

@ -1,7 +1,7 @@ @@ -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;

8
core/src/main/java/common/ecommerce/capability/ShippingLabelCapable.java → channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java

@ -1,8 +1,8 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/account/AccountKey.java → channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/account/ChannelAccount.java → channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java → channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/aftersale/AfterSaleQuery.java → channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.aftersale;
package common.ecommerce.channel.model.aftersale;
import java.time.LocalDate;
import java.util.ArrayList;

2
core/src/main/java/common/ecommerce/model/aftersale/AfterSaleType.java → channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.aftersale;
package common.ecommerce.channel.model.aftersale;
/**
* 售后类型。

2
core/src/main/java/common/ecommerce/model/fulfillment/DeclaredItem.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.math.BigDecimal;
import java.util.ArrayList;

2
core/src/main/java/common/ecommerce/model/fulfillment/LabelQuery.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.util.ArrayList;
import java.util.Collections;

2
core/src/main/java/common/ecommerce/model/fulfillment/OrderEditRequest.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.math.BigDecimal;
import java.util.ArrayList;

2
core/src/main/java/common/ecommerce/model/fulfillment/OrderEditResult.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.util.ArrayList;
import java.util.Collections;

2
core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import common.ecommerce.shared.support.Money;

2
core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderQuery.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.time.Instant;
import java.util.ArrayList;

2
core/src/main/java/common/ecommerce/model/fulfillment/OutboundPackage.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.util.Objects;

2
core/src/main/java/common/ecommerce/model/fulfillment/OutboundResult.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.util.ArrayList;
import java.util.Collections;

2
core/src/main/java/common/ecommerce/model/fulfillment/ShipmentReviewResult.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import java.util.ArrayList;
import java.util.Collections;

2
core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java → channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import common.ecommerce.shared.model.ChannelProvider;

2
core/src/main/java/common/ecommerce/model/order/OrderLine.java → channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.order;
package common.ecommerce.channel.model.order;
import common.ecommerce.shared.support.Money;

2
core/src/main/java/common/ecommerce/model/order/SalesOrder.java → channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/order/SalesOrderQuery.java → channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.order;
package common.ecommerce.channel.model.order;
import java.time.Instant;
import java.util.Objects;

4
core/src/main/java/common/ecommerce/model/order/SalesOrderRef.java → channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java

@ -1,6 +1,6 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/product/ProductListing.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/model/product/ProductQuery.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
import java.time.Instant;
import java.util.ArrayList;

2
core/src/main/java/common/ecommerce/model/product/ProductRef.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
import java.util.Objects;

2
core/src/main/java/common/ecommerce/model/product/ProductSearchField.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
/**
* 商品搜索维度。

2
core/src/main/java/common/ecommerce/model/product/ProductStatus.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
/**
* 统一商品状态。

2
core/src/main/java/common/ecommerce/model/product/ProductSyncStrategy.java → channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
/** 商品同步策略,适配器声明自己支持哪一种。 */
public enum ProductSyncStrategy {

2
core/src/main/java/common/ecommerce/model/settlement/SettlementQuery.java → channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.settlement;
package common.ecommerce.channel.model.settlement;
import java.time.Instant;
import java.time.LocalDate;

2
core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java → channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java

@ -1,4 +1,4 @@ @@ -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;

8
core/src/main/java/common/ecommerce/sdk/AdapterFactory.java → channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java

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

2
core/src/main/java/common/ecommerce/sdk/CallSupport.java → channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java

@ -1,4 +1,4 @@ @@ -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;

2
core/src/main/java/common/ecommerce/sdk/ChannelConnection.java → channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.sdk;
package common.ecommerce.channel.sdk;
import common.ecommerce.shared.spi.ChannelSecret;

6
core/src/main/java/common/ecommerce/sdk/ChannelContext.java → channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java

@ -1,7 +1,7 @@ @@ -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;

28
core/src/main/java/common/ecommerce/sdk/ChannelSdk.java → channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java

@ -1,24 +1,24 @@ @@ -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;

6
core/src/main/java/common/ecommerce/sdk/ProviderResolver.java → channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java

@ -1,7 +1,7 @@ @@ -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 解析适配器。

4
core/src/main/java/common/ecommerce/spi/ChannelAccountRepository.java → channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java

@ -1,6 +1,6 @@ @@ -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;

6
core/src/main/java/common/ecommerce/spi/Sink.java → channel/src/main/java/common/ecommerce/channel/spi/Sink.java

@ -1,8 +1,8 @@ @@ -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 只调用,不碰数据库。

8
core/src/main/java/common/ecommerce/sync/SyncEngine.java → channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java

@ -1,11 +1,11 @@ @@ -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;

16
core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java → channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java

@ -1,4 +1,4 @@ @@ -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; @@ -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;

12
core/src/test/java/common/ecommerce/sdk/CallObserverTest.java → channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java

@ -1,4 +1,4 @@ @@ -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; @@ -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;

24
core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java → channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java

@ -1,19 +1,19 @@ @@ -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 { @@ -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 { @@ -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 { @@ -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

14
core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java → channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java

@ -1,17 +1,17 @@ @@ -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 { @@ -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 行为影响。 */

2
http/pom.xml

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>

4
lingxing/pom.xml

@ -16,11 +16,11 @@ @@ -16,11 +16,11 @@
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-core</artifactId>
<artifactId>common-ecommerce-channel</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>

64
lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java

@ -1,15 +1,15 @@ @@ -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; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java

@ -1,10 +1,10 @@ @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java

@ -2,7 +2,7 @@ package common.ecommerce.lingxing.http; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java

@ -6,8 +6,8 @@ import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java

@ -1,7 +1,7 @@ @@ -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;
/**

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java

@ -7,7 +7,7 @@ import common.ecommerce.lingxing.LingxingApi; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java

@ -1,7 +1,7 @@ @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java

@ -1,7 +1,7 @@ @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java

@ -1,7 +1,7 @@ @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java

@ -1,7 +1,7 @@ @@ -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;
/**

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java

@ -1,7 +1,7 @@ @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java

@ -1,8 +1,8 @@ @@ -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;
/**

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java

@ -1,8 +1,8 @@ @@ -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;
/**

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java

@ -1,6 +1,6 @@ @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java

@ -1,6 +1,6 @@ @@ -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;

6
lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java

@ -7,9 +7,9 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java

@ -4,8 +4,8 @@ import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto; @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java

@ -16,10 +16,10 @@ import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderDto; @@ -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;

8
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; @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java

@ -1,6 +1,6 @@ @@ -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;

6
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java

@ -12,9 +12,9 @@ import common.ecommerce.lingxing.platform.LingxingCall; @@ -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;

8
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; @@ -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;

6
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java

@ -8,9 +8,9 @@ import common.ecommerce.lingxing.platform.LingxingCall; @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java

@ -1,6 +1,6 @@ @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/ebay/product/EbayProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/LingxingOrderFilters.java

@ -7,7 +7,7 @@ import java.util.List; @@ -7,7 +7,7 @@ import java.util.List;
/**
* 领星多平台订单列表({@code /pb/mp/order/v2/list})的<b>专有过滤条件</b>。
*
* <p>通用的时间窗、分页、游标仍由 {@link common.ecommerce.model.order.SalesOrderQuery}
* <p>通用的时间窗、分页、游标仍由 {@link common.ecommerce.channel.model.order.SalesOrderQuery}
* 提供;这里只放领星协议独有的参数,避免把领星字段污染到 core 的跨渠道模型。</p>
*
* <p>所有条件都是可选的,全部为空时按「账户 + 更新时间窗」做常规同步。

6
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSource.java

@ -13,9 +13,9 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; @@ -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;

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/outbound/MultiPlatformOutboundSource.java

@ -6,8 +6,8 @@ import common.ecommerce.lingxing.LingxingApi; @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchBody.java

@ -1,6 +1,6 @@ @@ -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;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/product/LingxingProductSearchMapper.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.lingxing.platform.multiplatform.product;
import common.ecommerce.model.product.ProductSearchField;
import common.ecommerce.channel.model.product.ProductSearchField;
/**
* 领星侧各平台的「搜索维度 → 平台枚举值」映射。

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/multiplatform/shop/MultiPlatformShopSource.java

@ -1,6 +1,6 @@ @@ -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; @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/shein/product/SheinProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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;

10
lingxing/src/main/java/common/ecommerce/lingxing/platform/target/product/TargetProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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 { @@ -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;

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java

@ -9,13 +9,13 @@ import common.ecommerce.shared.error.ChannelException; @@ -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;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save