Browse Source

Merge remote-tracking branch 'origin/feature/supplier-lingxing' into feature/supplier-lingxing

# Conflicts:
#	channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java
#	channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java
#	channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java
#	channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java
#	lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
#	lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java
#	testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java
#	testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java
feature/supplier-lingxing
lml 2 weeks ago
parent
commit
e83fa60a25
  1. 205
      GUIDE.md
  2. 432
      README.md
  3. 31
      channel/pom.xml
  4. 6
      channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java
  5. 16
      channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java
  6. 20
      channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java
  7. 10
      channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java
  8. 4
      channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java
  9. 0
      channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java
  10. 0
      channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java
  11. 0
      channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java
  12. 10
      channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java
  13. 8
      channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java
  14. 10
      channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java
  15. 34
      channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java
  16. 10
      channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java
  17. 16
      channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java
  18. 22
      channel/src/main/java/common/ecommerce/channel/capability/Products.java
  19. 16
      channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java
  20. 30
      channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java
  21. 10
      channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java
  22. 20
      channel/src/main/java/common/ecommerce/channel/capability/Settlements.java
  23. 6
      channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java
  24. 8
      channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java
  25. 8
      channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java
  26. 12
      channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java
  27. 10
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java
  28. 2
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java
  29. 2
      channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java
  30. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java
  31. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java
  32. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java
  33. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java
  34. 8
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java
  35. 4
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java
  36. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java
  37. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java
  38. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java
  39. 2
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java
  40. 4
      channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java
  41. 4
      channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java
  42. 8
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java
  43. 2
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java
  44. 4
      channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java
  45. 10
      channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java
  46. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java
  47. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java
  48. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java
  49. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java
  50. 2
      channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java
  51. 2
      channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java
  52. 8
      channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java
  53. 12
      channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java
  54. 8
      channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java
  55. 4
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java
  56. 12
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java
  57. 57
      channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java
  58. 6
      channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java
  59. 4
      channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java
  60. 8
      channel/src/main/java/common/ecommerce/channel/spi/Sink.java
  61. 14
      channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java
  62. 34
      channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java
  63. 30
      channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java
  64. 80
      channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java
  65. 34
      channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java
  66. 2
      http/pom.xml
  67. 4
      http/src/main/java/common/ecommerce/http/OkHttpTransport.java
  68. 10
      http/src/main/java/common/ecommerce/http/Responses.java
  69. 2
      http/src/main/java/common/ecommerce/http/Signer.java
  70. 14
      http/src/main/java/common/ecommerce/http/TokenManager.java
  71. 12
      http/src/test/java/common/ecommerce/http/ResponsesTest.java
  72. 12
      http/src/test/java/common/ecommerce/http/TokenManagerTest.java
  73. 6
      lingxing/pom.xml
  74. 2
      lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
  75. 72
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
  76. 12
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
  77. 6
      lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
  78. 2
      lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java
  79. 8
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
  80. 6
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
  81. 2
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
  82. 10
      lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
  83. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
  84. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
  85. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingLabelSource.java
  86. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderEditSource.java
  87. 10
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
  88. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
  89. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundSource.java
  90. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingProductSource.java
  91. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSettlementSource.java
  92. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShipmentReviewSource.java
  93. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingShopSource.java
  94. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatform.java
  95. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java
  96. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java
  97. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleListSource.java
  98. 12
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aftersale/LingxingAfterSaleMapper.java
  99. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java
  100. 20
      lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/product/AliexpressProductSource.java
  101. Some files were not shown because too many files have changed in this diff Show More

205
GUIDE.md

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
> 面向「要接入一个新平台」和「要写业务调用」的人。
> 读完之后你应该能回答三个问题:SDK 的分层是什么、加一个供应商要动哪些文件、加完之后怎么测。
>
> 配套材料:`README.md`(包职责与调用方式速查)、`D:\woker\文档\01需求分析\2026-10-28-电商平台\2026-10-26-cross-border-fulfillment-sdk-design.md`(Spec 0 总体设计)。
> 配套材料:`README.md`(架构图、包结构与调用方式速查)、`D:\woker\文档\01需求分析\2026-10-28-电商平台\2026-10-26-cross-border-fulfillment-sdk-design.md`(Spec 0 总体设计)。
---
@ -127,7 +127,7 @@ public interface PlatformAdapter { @@ -127,7 +127,7 @@ public interface PlatformAdapter {
### 3.2 能力接口
供应商实现哪些接口,就声明哪些能力。目前有两个:
供应商实现哪些接口,就声明哪些能力。接口都继承 `PlatformAdapter`:
```java
public interface SalesOrderCapable extends PlatformAdapter {
@ -143,11 +143,24 @@ public interface ProductCapable extends PlatformAdapter { @@ -143,11 +143,24 @@ public interface ProductCapable extends PlatformAdapter {
}
```
其余能力接口(按需实现,不实现就不声明):
| 接口 | 读/写 | 关键方法 |
|:---|:---:|:---|
| `SettlementCapable` | 读 | `pull(ctx, SettlementQuery)` |
| `AfterSaleCapable` | 读 | `pull(ctx, AfterSaleQuery)` |
| `OutboundOrderCapable` | 读 | `pull(ctx, OutboundOrderQuery)` |
| `ShippingLabelCapable` | 读 | `labels(ctx, LabelQuery)` |
| `OutboundCapable` | **写** | `submit(ctx, packages)` / `results(ctx, globalOrderNos)` |
| `ShipmentReviewCapable` | **写** | `review(ctx, globalOrderNos)` |
| `OrderEditCapable` | **写** | `edit(ctx, requests)` |
| `AggregatorCapable` | — | `listSubChannels(ctx)`,聚合器额外实现 |
**为什么 `get` 的参数是 `SalesOrderRef` / `ProductRef` 而不是 `String`?**
Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现订单和商品的适配器(比如直连沃尔玛)**无法同时实现**,编译器直接报名称冲突。所以包成两个不同的类。
Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现订单和商品的适配器(比如直连沃尔玛)**无法同时实现**,编译器直接报名称冲突。所以包成两个不同的类。对外的门面视图仍收 `String`(`sdk.salesOrders(key, conn).get("PO-123")`),由视图负责包装。
> 对应的 import 路径:`common.ecommerce.model.order.SalesOrderRef`、`common.ecommerce.model.product.ProductRef`。`model` 包按职责拆成 `account` / `order` / `product` / `support` 四个子包,枚举留在 `model` 根包。
> 对应的 import 路径:`common.ecommerce.channel.model.order.SalesOrderRef`、`common.ecommerce.channel.model.product.ProductRef`。`channel.model` 按职责拆成 `account` / `order` / `product` / `fulfillment` / `aftersale` / `settlement` 六个子包;枚举在 `common.ecommerce.shared.model` 根包。
**为什么 `pull` 返回 `Page<T>` 而不是 `List<T>`?**
@ -157,14 +170,20 @@ Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现 @@ -157,14 +170,20 @@ Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现
```java
public final class ChannelSdk implements ProviderResolver {
public CapabilityReport capabilities(AccountKey key); // 只读,不发请求
public SalesOrders salesOrders(AccountKey key, ChannelConnection conn); // 订单视图
public Products products(AccountKey key, ChannelConnection conn); // 商品视图
public IdempotencyGuard writes(); // 写操作守卫
public PlatformAdapter resolve(AccountKey key); // 按 key 找适配器
public CapabilityReport capabilities(AccountKey key); // 只读,不发请求
public SalesOrders salesOrders(AccountKey key, ChannelConnection conn); // 订单视图
public Products products(AccountKey key, ChannelConnection conn); // 商品视图
public Settlements settlements(AccountKey key, ChannelConnection conn); // 账单视图(读)
public AfterSales afterSales(AccountKey key, ChannelConnection conn); // 售后视图(读)
public Outbounds outbounds(AccountKey key, ChannelConnection conn); // 出库/面单/审核视图
public List<AggregatorCapable.SubChannel> subChannels(AccountKey key, ChannelConnection conn);
public IdempotencyGuard writes(); // 写操作守卫
public PlatformAdapter resolve(AccountKey key); // 按 key 找适配器
}
```
写类能力(`submit` / `review` / `edit`)挂在 `Outbounds` 视图上,**仍必须经 `sdk.writes()` 包一层幂等**再调用。
门面**不做**:不选 provider、不自动兜底、不重试、不缓存。
每次调用固定三步:
@ -190,12 +209,13 @@ key → accountRepository.findByKey(provider, platform, omsStoreId) @@ -190,12 +209,13 @@ key → accountRepository.findByKey(provider, platform, omsStoreId)
| SPI | 作用 | 读要用 | 写要用 |
|:---|:---|:---:|:---:|
| `ChannelAccountRepository` | 读渠道账户 | ✅ | ✅ |
| `ChannelAccountRepository`(channel) | 读渠道账户 | ✅ | ✅ |
| `ChannelSecret` | 凭据载体,调用时经 `ChannelConnection` 传入 | ✅ | ✅ |
| `SecretProvider` | ~~按 credentialRef 取密钥~~ **已废弃**:凭据由调用方传入 | — | — |
| `TokenStore` | token 读写(宿主加密) | ✅ | ✅ |
| `LockProvider` | token 刷新防击穿 | ✅ | ✅ |
| `SyncCursorStore` | 水位线 | 批量读 | — |
| `Sink` | 领域对象落库 | 批量读 | — |
| `Sink`(channel) | 领域对象落库 | 批量读 | — |
| `IdempotencyStore` | 幂等键抢占与结果 | — | ✅ |
### 3.5 错误类型
@ -359,19 +379,19 @@ if (r.alreadyCompleted()) { @@ -359,19 +379,19 @@ if (r.alreadyCompleted()) {
## 五、加一个供应商:8 步
以新增 `acme` 直连平台为例。**核心原则:不改 core、不改门面、不改宿主。**
以新增 `acme` 直连平台为例。**核心原则:不改 channel、不改门面、不改宿主。**
### 第 0 步:先想清楚三件事
| 问题 | 影响 |
|:---|:---|
| 它属于哪个 `Platform`? | 枚举里有直接用;没有才加(唯一允许改 core 的地方) |
| 它属于哪个 `Platform`? | 枚举里有直接用;没有才加(唯一允许改 `shared` 的地方) |
| 走 `DIRECT` 还是新聚合器? | 新聚合器才加 `ChannelProvider` 枚举值 |
| 它会哪些能力? | 只列真能做的 |
现有枚举:
现有枚举(`common.ecommerce.shared.model`):
- `Platform`:`AMAZON_SC` `AMAZON_VC` `WALMART_SC` `WALMART_1P` `TIKTOK` `TEMU` `EBAY` `SHEIN` `MIRAKL` `TARGET` `BESTBUY` `AEPH` `CUSTOM`
- `Platform`:`AMAZON_SC` `AMAZON_VC` `WALMART_SC` `WALMART_1P` `TIKTOK` `TEMU` `EBAY` `SHEIN` `ALIEXPRESS` `MIRAKL` `TARGET` `BESTBUY` `AEPH` `WAYFAIR` `MICHAELS` `ECHO` `LOSDLIUS` `CUSTOM`
- `ChannelProvider`:`DIRECT` `LINGXING` `TEAPPLIX` `CUSTOM`
### 第 1 步:建模块
@ -381,7 +401,11 @@ if (r.alreadyCompleted()) { @@ -381,7 +401,11 @@ if (r.alreadyCompleted()) {
```xml
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-core</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-channel</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
@ -406,17 +430,17 @@ if (r.alreadyCompleted()) { @@ -406,17 +430,17 @@ if (r.alreadyCompleted()) {
```java
package common.ecommerce.acme;
// model 包按职责分了子包,import 时注意:
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.support.PlatformTime;
// 枚举在 shared.model,渠道域模型在 channel.model
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.model.order.SalesOrderRef;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.support.PlatformTime;
public final class AcmeConstants {
@ -456,7 +480,7 @@ public final class AcmeOrderDto { @@ -456,7 +480,7 @@ public final class AcmeOrderDto {
**平台字段名只允许出现在 DTO 和 Mapper 里。**
**DTO 用 Lombok,领域模型不用。** DTO 是纯数据容器,没有不变量要保护,`@Getter`/`@Setter`
省掉全部样板;`core` 的模型是不可变 + Builder,本来就没有 setter,且 `core` 要尽量少依赖
省掉全部样板;`channel` 的模型是不可变 + Builder,本来就没有 setter,且 `channel` 要尽量少依赖
编译期工具。Lombok 声明为 `scope=provided`,不进宿主运行时。
**端点和路径写成常量,不做配置。** 协议细节(URL、字段名、限流值)是代码的一部分——
@ -560,27 +584,23 @@ public final class AcmeSigner { @@ -560,27 +584,23 @@ public final class AcmeSigner {
```java
public final class AcmeAdapter implements SalesOrderCapable {
private final String baseUrl;
private final HttpTransport transport;
private final JacksonJsonCodec json;
private final SecretProvider secretProvider;
private final Clock clock;
private final TokenManager tokenManager;
private final AcmeOrderMapper mapper = new AcmeOrderMapper();
public AcmeAdapter(String baseUrl, HttpTransport transport, JacksonJsonCodec json,
SecretProvider secretProvider, TokenStore tokenStore,
LockProvider lockProvider, Clock clock) {
this.baseUrl = baseUrl;
// 适配器只持有协议与基础设施:端点与凭据随每次调用的 ChannelContext 进来
public AcmeAdapter(HttpTransport transport, JacksonJsonCodec json,
TokenStore tokenStore, LockProvider lockProvider, Clock clock) {
this.transport = transport;
this.json = json;
this.secretProvider = secretProvider;
this.clock = clock;
final AcmeTokenClient tokenClient = new AcmeTokenClient(transport, json, baseUrl);
final AcmeTokenClient tokenClient = new AcmeTokenClient(transport, json, clock);
this.tokenManager = new TokenManager(tokenStore, lockProvider, clock, 600) {
@Override
protected AccessToken refresh(ChannelSecret secret, AccessToken previous) {
return tokenClient.fetch(secret.appKey(), secret.appSecret());
return tokenClient.fetch(secret.endpointBaseUrl(), secret.appKey(), secret.appSecret());
}
};
}
@ -604,7 +624,7 @@ public final class AcmeAdapter implements SalesOrderCapable { @@ -604,7 +624,7 @@ public final class AcmeAdapter implements SalesOrderCapable {
HttpRequest req = HttpRequest.builder()
.method("POST")
.url(baseUrl + AcmeConstants.PATH_ORDERS)
.url(ctx.endpointBaseUrl() + AcmeConstants.PATH_ORDERS) // ★ 端点来自 ctx
.header("Content-Type", "application/json")
.header("Authorization", authHeader(ctx))
.header("X-Request-Id", ctx.requestId())
@ -641,8 +661,8 @@ public final class AcmeAdapter implements SalesOrderCapable { @@ -641,8 +661,8 @@ public final class AcmeAdapter implements SalesOrderCapable {
private String authHeader(ChannelContext ctx) {
ChannelAccount account = ctx.account();
ChannelSecret secret = secretProvider.get(account.credentialRef());
AccessToken token = tokenManager.getOrRefresh("acme:" + account.externalStoreId(), secret);
// 凭据由调用方经 ChannelConnection 传入,适配器不自己去找
AccessToken token = tokenManager.getOrRefresh("acme:" + account.externalStoreId(), ctx.secret());
return token.tokenType() + " " + token.value();
}
@ -673,13 +693,11 @@ public final class AcmeAdapter implements SalesOrderCapable { @@ -673,13 +693,11 @@ public final class AcmeAdapter implements SalesOrderCapable {
```java
public final class AcmeAdapterFactory implements AdapterFactory {
private final SecretProvider secretProvider;
private final TokenStore tokenStore;
private final LockProvider lockProvider;
private final Clock clock;
public AcmeAdapterFactory(SecretProvider secretProvider, TokenStore tokenStore,
LockProvider lockProvider, Clock clock) { ... }
public AcmeAdapterFactory(TokenStore tokenStore, LockProvider lockProvider, Clock clock) { ... }
@Override public String adapterId() { return AcmeConstants.ADAPTER_ID; }
@Override public ChannelProvider provider() { return ChannelProvider.DIRECT; }
@ -687,17 +705,15 @@ public final class AcmeAdapterFactory implements AdapterFactory { @@ -687,17 +705,15 @@ public final class AcmeAdapterFactory implements AdapterFactory {
@Override
public PlatformAdapter create(AdapterConfig config) {
String baseUrl = config.endpointBaseUrl() == null
? AcmeConstants.DEFAULT_BASE_URL : config.endpointBaseUrl();
return new AcmeAdapter(baseUrl,
new OkHttpTransport("common-ecommerce/1.0.0 (acme)"),
new JacksonJsonCodec(),
secretProvider, tokenStore, lockProvider, clock);
// 生产端点由调用方的 ChannelConnection 提供;config 只用于测试/联调时覆盖目标地址
return new AcmeAdapter(new OkHttpTransport("common-ecommerce/1.0.0 (acme)"),
new JacksonJsonCodec(), tokenStore, lockProvider, clock);
}
}
```
工厂的意义:把「怎么 new」和「业务怎么用」隔开。宿主只注册工厂,不需要知道构造参数。
**工厂不持有凭据**——凭据随每次调用的 `ChannelConnection` 进来。
### 第 8 步:接进门面
@ -706,7 +722,7 @@ ChannelSdk sdk = ChannelSdk.builder() @@ -706,7 +722,7 @@ ChannelSdk sdk = ChannelSdk.builder()
.accountRepository(accountRepo)
.idempotencyStore(idempotencyStore) // 要写操作就必须
.idempotencyOwner(hostName) // 多实例时区分抢占方
.register(new AcmeAdapterFactory(secretProvider, tokenStore, lockProvider, clock))
.register(new AcmeAdapterFactory(tokenStore, lockProvider, clock))
.build();
AccountKey key = AccountKey.of(ChannelProvider.DIRECT, Platform.AMAZON_SC, "oms-amz-001");
@ -770,24 +786,49 @@ assertEquals(md5Hex("secretapp_keyk1"), AcmeSigner.sign(params, "secret")); @@ -770,24 +786,49 @@ assertEquals(md5Hex("secretapp_keyk1"), AcmeSigner.sign(params, "secret"));
时间相关的用 DST 边界:2026-03-08 美国太平洋时区进入夏令时,前后各测一次。
### 第 2 层:真实环境冒烟(主力)
### 第 2 层:契约测试(主力)
用 `RecordingTransport` + 夹具断言「请求怎么拼、响应怎么解」,**不联网**:
```java
RecordingTransport transport = new RecordingTransport()
.tokenResponse("{\"data\":{\"access_token\":\"t-1\",\"expires_in\":7200}}")
.route("/v1/orders", "POST",
r -> Responses.ok(JsonFixture.load("fixtures/acme/orderList/success.json")));
当前只保留真实环境冒烟(`LingxingLiveSmokeTest`),不再使用录制报文。
AcmeAdapter adapter = new AcmeAdapter(transport, json, new InMemoryTokenStore(), locks, fixedClock);
ChannelContext ctx = ChannelContext.of(account, connection, "req-1", fixedClock);
做法:在测试类顶部写常量(本地联调时填真实值,不提交),用真实的
`OkHttpTransport` 直接打平台接口;未填常量时用 `Assumptions` 跳过,
避免占位串打到线上。
Page<SalesOrder> page = adapter.pull(ctx, query);
HttpRequest last = transport.lastRequest();
assertTrue(last.body().contains("\"updated_after\""));
assertEquals("ACME-1001", page.items().get(0).channelOrderId());
```
夹具按 `src/test/resources/fixtures/{platform}/{operation}/{case}.json` 存放,每个平台至少「正常 + 异常」两套。
真实报文跑通后存成新夹具,以后改代码不用再连真实环境。
### 第 3 层:真实环境冒烟(手动,不进 CI)
做法:凭据用**系统属性**传入(不要写成常量提交),未提供时用 `Assumptions` 跳过:
```bash
mvn -pl lingxing -am test -Dtest=AcmeLiveSmokeTest \
-Dacme.probe.appKey=xxx -Dacme.probe.appSecret=yyy
```
```java
class AcmeLiveSmokeTest {
private static final String APP_KEY = "在这里填 AppID";
private static final String APP_SECRET = "在这里填 AppSecret";
private static final String APP_KEY = System.getProperty("acme.probe.appKey", "");
private static final String APP_SECRET = System.getProperty("acme.probe.appSecret", "");
private final HttpTransport transport = new OkHttpTransport("common-ecommerce-smoke");
@Test
void tokenCanBeFetched() {
Assumptions.assumeTrue(!APP_KEY.isEmpty() && !APP_SECRET.isEmpty(), "未提供凭据,跳过");
AccessToken token = new AcmeTokenClient(transport, json, Clock.systemUTC())
.fetch(BASE_URL, APP_KEY, APP_SECRET);
assertNotNull(token.value());
@ -796,9 +837,11 @@ class AcmeLiveSmokeTest { @@ -796,9 +837,11 @@ class AcmeLiveSmokeTest {
```
联调时把请求和响应打出来(token 打码),签名或字段名不对时靠日志定位。
**凭证不要提交到仓库**,联调完重置。
**凭证不要提交到仓库**(提交历史里的密钥要轮换),联调完重置。
### 第 3 层:分页与水位线
> 领星尤其注意:真实环境**只跑查询类接口**。出库、审核发货这类写接口没有测试环境,误操作不可回滚。
### 第 4 层:分页与水位线
```java
@Test
@ -836,7 +879,7 @@ void pagesThroughAllOrdersAndAdvancesWatermarkOnce() { @@ -836,7 +879,7 @@ void pagesThroughAllOrdersAndAdvancesWatermarkOnce() {
- 返回空页 → 立刻结束,不无限循环
- 没有水位线 → 抛 `IllegalStateException`
### 第 4 层:门面 + 能力
### 第 5 层:门面 + 能力
```java
@Test
@ -855,33 +898,6 @@ void facadeRejectsUnsupportedCapability() { @@ -855,33 +898,6 @@ void facadeRejectsUnsupportedCapability() {
聚合器还要额外测:同一适配器,Walmart 账户和 eBay 账户的 `supports` 结果不同。
### 第 5 层:真实冒烟(手动,不进 CI)
参考 `lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java`:没配环境变量时整类跳过。
```java
@EnabledIfEnvironmentVariable(named = "ACME_APP_KEY", matches = ".+")
class AcmeLiveSmokeTest {
@Test
void tokenCanBeFetched() { ... } // 先验认证
@Test
void pullsOnePage() { ... } // 再验报文
}
```
包一层 `LoggingTransport` 打印请求响应(Authorization 打码、body 截断)。
**排错顺序**:
1. 401 / 403 → 先单独跑 token 测试;还失败就查出口 IP 白名单。
2. token 通了但接口报签名错 → 只改 `Signer`,跑已知向量。
3. 200 但 0 条 → 查时间窗、`platform_code`、`store_id` 是否属于同一店铺。
4. 200 有数据但字段 null → 对照原始报文改 DTO 的 `@JsonProperty`,然后把真实响应存成新夹具。
**真实报文转夹具**:冒烟跑通后,把打印的响应存成 `fixtures/acme/orderList/real-2026-10-29.json`,加一个 Mapper 用例。以后改代码不用再连真实环境。
---
## 七、验收清单
@ -899,20 +915,21 @@ class AcmeLiveSmokeTest { @@ -899,20 +915,21 @@ class AcmeLiveSmokeTest {
| 7 | 超长时间窗会截断 | 断言 body 里的起止时间 |
| 8 | 写操作只执行一次 | `adapter.writeCallCount() == 1` |
| 9 | 水位线失败不推进 | 第二页抛异常后断言水位线不变 |
| 10 | core 零改动 | `git diff core/` 应只有 `Platform` 枚举 |
| 10 | channel / shared 零改动 | `git diff channel/ shared/` 应只有 `shared/model/Platform` 枚举 |
---
## 八、已知缺口与坑
### 当前实现状态(2026-10-29)
### 当前实现状态(2026-11-06)
| 模块 | 状态 |
|:---|:---|
| core | 模型、能力接口、门面、SyncEngine、幂等守卫、SPI 全部可用 |
| shared | 枚举、异常、SPI 契约、幂等守卫、审计、水位线通用类型全部可用 |
| channel | 领域模型、能力接口、门面、SyncEngine、账户/落库 SPI 全部可用 |
| http | OkHttp 传输、Jackson 编解码、签名接口、TokenManager 模板可用 |
| testkit | InMemory SPI、FakeDirectAdapter、MutableClock 可用 |
| lingxing | 订单列表拉取可用;商品、履约、面单、账单、售后未实现 |
| lingxing | 16 个子平台:订单 / 店铺全量;商品 8 个平台;结算、售后目前只有亚马逊 SC;出库单 / 面单 / 审核发货 / 订单编辑为 ERP 级、全平台共用 |
| 其它平台 | 未开始 |
### 编码坑(按踩到概率排序)
@ -936,7 +953,7 @@ class AcmeLiveSmokeTest { @@ -936,7 +953,7 @@ class AcmeLiveSmokeTest {
| `RefundLedger` 未实现 | 无超退校验 | 与 `IdempotencyGuard` 配合 |
| `DuplicateOrderGuard` 未实现 | 跨 provider 重复订单无告警 | 新增 SPI |
| 领星时间窗超 31 天被静默截断 | 水位线落后太多会漏中间段 | 调用方分段补拉 |
| 领星单订单详情未实现 | `get()` 直接抛异常 | 用 `pull` + 时间窗捞 |
| 领星单订单详情未实现 | 除亚马逊 SC / VC 外的子平台 `get()` 直接抛异常 | 用 `pull` + 时间窗捞 |
| 领星限流器用 `Thread.sleep` | 多店并发时按实例数放大 | 按账户拆适配器实例,或换通用限流器 |
---
@ -944,7 +961,7 @@ class AcmeLiveSmokeTest { @@ -944,7 +961,7 @@ class AcmeLiveSmokeTest {
## 九、上手顺序
1. **读三个文件**:`PlatformAdapter`、`SalesOrderCapable`、`ChannelSdk`。不到 150 行,看懂这三个就懂一半。
2. **跑一遍现有测试**:`mvn -pl lingxing -am test`,对照看 `LingxingAdapterTest` —— 它就是「加一个供应商」的完整范例。
2. **跑一遍现有测试**:`mvn -pl lingxing -am test`,对照看 `LingxingSdkListingCallTest`(门面 + 契约)与 `LingxingAfterSaleListSourceTest`(Source + 夹具)—— 它们就是「加一个供应商」的完整范例。
3. **抄领星的结构**建新模块:`Constants → Dto → Mapper → Adapter → Factory → Test`。
4. **先用夹具跑通,再连真实环境。** 不要反过来。
@ -953,6 +970,6 @@ class AcmeLiveSmokeTest { @@ -953,6 +970,6 @@ class AcmeLiveSmokeTest {
```bash
mvn clean test # 全部
mvn -pl lingxing -am test # 单模块(含依赖)
mvn -pl lingxing -am test -Dtest=LingxingAdapterTest # 单个测试类
mvn -pl lingxing -am test -Dtest=LingxingSdkListingCallTest # 单个测试类
mvn -pl lingxing -am test -Dtest=LingxingLiveSmokeTest # 真实环境冒烟(需环境变量)
```

432
README.md

@ -7,25 +7,124 @@ @@ -7,25 +7,124 @@
纯 SDK 库,嵌入宿主(OMS)进程运行。**不访问数据库、不访问 Redis、不访问 MQ、不私起线程或定时器**。所有外部副作用通过 SPI 注入,由宿主实现。
```
① 统一入口 ChannelSdk / 各能力门面
② 能力接口 ProductCapable / SalesOrderCapable / FulfillmentCapable / ...
③ 平台适配 amazon-sc / walmart-sc / tiktok / temu / lingxing / ...
④ 基础设施 HttpTransport / Signer / TokenManager / RateLimiter / SyncEngine / Idempotency
① 统一入口 ChannelSdk / 各能力视图(SalesOrders / Products / Outbounds / AfterSales / Settlements)
② 能力接口 ProductCapable / SalesOrderCapable / ShippingLabelCapable / AfterSaleCapable / ...
③ 平台适配 lingxing(聚合:amazon-sc / walmart / tiktok / temu / ebay / shein / target …)
④ 基础设施 HttpTransport / Signer / TokenManager / LingxingRateLimiter / SyncEngine / Idempotency
⑤ 宿主 SPI AccountRepository / TokenStore / SyncCursorStore / Sink / Clock / LockProvider / ...
```
## 架构图
**分层与依赖**:业务只依赖 `channel` 的门面与模型;平台协议全部关在适配器里;
`shared` 被所有模块共享,但不反向依赖任何领域模块。
```mermaid
graph TD
subgraph HOST["宿主进程(OMS)"]
BIZ["业务代码"]
IMPL["宿主 SPI 实现<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-core` | 领域模型、能力接口、门面、管道、SPI。**零第三方运行时依赖** |
| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码 |
| `common-ecommerce-shared` | **跨域共享层**:异常体系、SPI 契约、幂等、审计、水位线、通用值对象(Money / Page / PlatformTime / 枚举)。不依赖任何领域模块 |
| `common-ecommerce-channel` | 渠道域:领域模型、能力接口、门面、同步管道。依赖 `shared` |
| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码。依赖 `shared`,**不依赖 `channel`** |
| `common-ecommerce-testkit` | InMemory SPI 与测试替身 |
| `common-ecommerce-lingxing` | 领星聚合适配器(多子平台)。DTO 用 Lombok 生成访问器 |
依赖方向:
```
channel ─┐
http ────┼──→ shared
testkit ─┘
lingxing ──→ channel, http, shared
```
渠道域与未来的仓库域平级,互不依赖,只共享 `shared`。`http` 不依赖 `channel`,仓库域可以直接复用传输层与令牌管理。
**Lombok 使用范围**:仅 `lingxing` 模块的 `dto/*`,`scope=provided`,不进宿主运行时。
`core` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限,
而 `core` 要尽量少依赖编译期工具。
`channel` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限,
而 `channel` 要尽量少依赖编译期工具。
## 构建
@ -40,29 +139,149 @@ mvn clean test @@ -40,29 +139,149 @@ mvn clean test
---
## 一、包职责
## 一、包结构
按当前代码实际目录生成(`src/main/java`,测试包与主代码同构)。模块名在注释里标出。
```
common.ecommerce
├── model 领域模型(core)
│ ├── account AccountKey / ChannelAccount
│ ├── order SalesOrder / OrderLine / Query / Ref
│ ├── product ProductListing / Query / Ref / SyncStrategy
│ └── support Money / PlatformTime / Page / CanonicalKeys
├── capability 能力接口,适配器实现这些(core)
├── error 统一异常体系(core)
├── sdk 门面、上下文、适配器工厂接口(core)
├── sync 增量同步引擎与水位线计算(core)
├── idempotency 写操作双锁幂等守卫(core)
├── spi 宿主必须实现的扩展点(core)
├── http HTTP 传输、JSON、签名、令牌(http)
├── testkit 测试替身与夹具(testkit)
└── lingxing 领星适配器(lingxing)
│
├── shared 跨域共享层(shared)
│ ├── model Platform / ChannelProvider / Capability / FulfillmentMode
│ ├── error ChannelException + Auth / RateLimit / Transient / Validation /
│ │ PlatformBusiness / IdempotencyConflict / CrossProviderConflict
│ ├── spi AccessToken / ChannelSecret / TokenStore / LockProvider /
│ │ IdempotencyStore(+Claim/Record/Status) / SyncCursorStore /
│ │ SecretProvider(已废弃)
│ ├── idempotency IdempotencyGuard / WriteScope / WriteResult / WriteAudit
│ ├── audit CallObserver / CallRecord / CallOutcome / Slf4jCallObserver
│ ├── sync SyncSpec / SyncResult
│ ├── support Money / PlatformTime / Page / CanonicalKeys
│ └── testkit 测试替身(testkit 模块):
│ FakeDirectAdapter / InMemory*(Accounts·Token·Cursor·Sink·
│ Lock·Idempotency) / RecordingTransport / Responses /
│ JsonFixture / MutableClock / TestData
│
├── channel 渠道域(channel)
│ ├── model
│ │ ├── account AccountKey / ChannelAccount
│ │ ├── order SalesOrder / OrderLine / SalesOrderQuery / SalesOrderRef
│ │ ├── product ProductListing / ProductQuery / ProductRef /
│ │ │ ProductSearchField / ProductStatus / ProductSyncStrategy
│ │ ├── fulfillment DeclaredItem / LabelQuery / OrderEditRequest / OrderEditResult /
│ │ │ OutboundOrder / OutboundOrderLine / OutboundOrderQuery /
│ │ │ OutboundPackage / OutboundResult / ShipmentReviewResult /
│ │ │ ShippingLabel
│ │ ├── aftersale AfterSale / AfterSaleQuery / AfterSaleType
│ │ └── settlement SettlementQuery / SettlementTransaction
│ ├── capability PlatformAdapter / AggregatorCapable / CapabilityReport /
│ │ AdapterCapabilityReport /
│ │ SalesOrderCapable / ProductCapable / SettlementCapable /
│ │ AfterSaleCapable / OutboundCapable / OutboundOrderCapable /
│ │ ShippingLabelCapable / ShipmentReviewCapable / OrderEditCapable /
│ │ 门面视图:SalesOrders / Products / Settlements / AfterSales / Outbounds
│ ├── sdk ChannelSdk / ChannelContext / ChannelConnection /
│ │ AdapterFactory / ProviderResolver / CallSupport
│ ├── spi ChannelAccountRepository / Sink
│ └── sync SyncEngine
│
├── http HTTP 与令牌(http)
│ HttpTransport / OkHttpTransport / HttpRequest / HttpResponse /
│ JsonCodec / JacksonJsonCodec / Signer / TokenManager / Responses
│
└── lingxing 领星聚合适配器(lingxing)
├── LingxingApi 接口定义(路径 + 限流参数)
├── LingxingConstants 端点、分页/时间窗限制、platform_code → Platform
├── adapter LingxingAdapter / LingxingAdapterFactory
├── auth LingxingTokenClient
├── http LingxingSigner / LingxingRequestFactory / LingxingRateLimiter /
│ LingxingEnvelope
├── mapper LingxingOrderMapper
├── dto 订单报文:LingxingOrderDto / OrderItem / OrderTag / LogisticsInfo /
│ PlatformInfo / SubProduct / TransactionInfo
└── platform
├── LingxingSubPlatform / LingxingSubPlatforms / LingxingSubPlatformDefaults
├── LingxingCall 每次调用的公共设施(token/限流/签名/信封)
├── Lingxing{Order,Product,Shop,Settlement,AfterSale,Outbound}Source
├── Lingxing{OutboundOrder,Label,ShipmentReview,OrderEdit}Source ERP 级,全平台共用
│
├── multiplatform/ 多平台统一接口(大多数子平台共用)
│ ├── order MultiPlatformOrderSource / LingxingOrderFilters
│ ├── product LingxingProductSearchMapper / LingxingProductSearchBody
│ ├── shop MultiPlatformShopSource
│ ├── outbound MultiPlatformOutboundSource / OutboundOkDto / OutboundFailDto
│ └── dto MultiPlatformShopDto
│
├── amazon/
│ ├── dto FbmOrderDto / FbmOrderItemDto
│ ├── order AmazonOrderSource / AmazonFbmOrderSource
│ ├── sc/ AmazonScSubPlatform
│ │ ├── product AmazonScProductSource
│ │ ├── shop AmazonScShopSource
│ │ └── dto AmazonOrder(Dto|Item|DetailDto|DetailItemDto) /
│ │ AmazonScListingDto / AmazonScShopDto /
│ │ AmazonSettlementTransactionDto / FbmOrderDetailDto
│ ├── vc/ AmazonVcSubPlatform
│ │ ├── order VcOrderSource
│ │ ├── product AmazonVcProductSource
│ │ ├── shop VcShopSource
│ │ └── dto VcOrderDto / VcOrderItemDto / VcOrderDfDetailDto /
│ │ VcOrderPoDetailDto / VcOrderDetailItemDto /
│ │ AmazonVcListingDto / VcShopDto
│ └── settlement AmazonSettlementSource
│
├── wms/ ERP 级实现(不区分平台)
│ ├── WmsOutboundOrderSource / WmsLabelSource /
│ │ ShipmentReviewSource / OrderEditSource
│ └── dto WmsOutboundOrder(Dto|ItemDto) / WmsLogisticsLabelDto /
│ WmsSurfaceFileDto / ShipmentReview(Data|Success|Failure)Dto /
│ OrderEditErrorDto
│
├── aftersale/ LingxingAfterSaleListSource / LingxingAfterSaleMapper
│ └── dto AfterSaleDto / AfterSaleItemDto / AmountDetailDto
│
├── aliexpress/ AliexpressSubPlatform
│ ├── product AliexpressProductSource
│ └── dto AliexpressListingDto / Warehouse / SupplyPrice
├── ebay/ EbaySubPlatform
│ ├── product EbayProductSource
│ └── dto EbayListingDto / EbayAutoRestockDto
├── shein/ SheinSubPlatform
│ ├── product SheinProductSource
│ └── dto SheinListingDto / Site / Warehouse / SupplyPrice
├── target/ TargetSubPlatform
│ ├── product TargetProductSource
│ └── dto TargetListingDto / TargetLocationDto
├── temu/ TemuSubPlatform
│ ├── product TemuProductSource
│ └── dto TemuListingDto / Warehouse / SupplyPrice / PromotionalPrice
├── tiktok/ TiktokSubPlatform
│ ├── product TiktokProductSource
│ └── dto TiktokListingDto / TiktokWarehouseDto
├── walmart/ WalmartSubPlatform
│ ├── order WalmartOrderSource
│ ├── product WalmartProductSource
│ └── dto WalmartListingDto
│
└── 仅订单 + 店铺(多平台通用接口):
aeph/ · bestbuy/ · custom/ · echo/ · losdlius/ · michaels/ · mirakl/ · wayfair/
```
包名统一前缀 `common.ecommerce.`,下表省略前缀。
### `model` —— 领域模型
### `shared` —— 跨域共享层
| 子包 | 内容 |
|:---|:---|
| `shared.model` | **枚举**:`Platform` / `ChannelProvider` / `Capability` / `FulfillmentMode` |
| `shared.error` | 异常体系(见下方「`shared.error`」) |
| `shared.spi` | 宿主扩展点与载体:`AccessToken` / `ChannelSecret` / `TokenStore` / `LockProvider` / `IdempotencyStore` / `SyncCursorStore` |
| `shared.idempotency` | `WriteScope` / `WriteResult` / `WriteAudit` / `IdempotencyGuard` |
| `shared.audit` | `CallObserver` / `CallRecord` / `CallOutcome` |
| `shared.sync` | `SyncSpec` / `SyncResult` |
| `shared.support` | `Money` / `PlatformTime` / `Page` / `CanonicalKeys` |
### `channel.model` —— 领域模型
所有对象**不可变**,用 Builder 构造,无 setter。Java 8 不引入 record/sealed。
@ -70,31 +289,32 @@ common.ecommerce @@ -70,31 +289,32 @@ common.ecommerce
| 子包 | 内容 |
|:---|:---|
| `model`(本包) | **枚举**:`Platform` / `ChannelProvider` / `Capability` / `FulfillmentMode` |
| `model.account` | `AccountKey` / `ChannelAccount` |
| `model.order` | `SalesOrder` / `OrderLine` / `SalesOrderQuery` / `SalesOrderRef` |
| `model.product` | `ProductListing` / `ProductQuery` / `ProductRef` / `ProductSyncStrategy` |
| `model.support` | `Money` / `PlatformTime` / `Page` / `CanonicalKeys` |
| `channel.model.account` | `AccountKey` / `ChannelAccount` |
| `channel.model.order` | `SalesOrder` / `OrderLine` / `SalesOrderQuery` / `SalesOrderRef` |
| `channel.model.product` | `ProductListing` / `ProductQuery` / `ProductRef` / `ProductSearchField` / `ProductStatus` / `ProductSyncStrategy` |
| `channel.model.fulfillment` | `OutboundOrder` / `OutboundOrderLine` / `OutboundOrderQuery` / `OutboundPackage` / `OutboundResult` / `ShippingLabel` / `LabelQuery` / `OrderEditRequest` / `OrderEditResult` / `ShipmentReviewResult` / `DeclaredItem` |
| `channel.model.aftersale` | `AfterSale` / `AfterSaleQuery` / `AfterSaleType` |
| `channel.model.settlement` | `SettlementQuery` / `SettlementTransaction` |
| 类 | 包袱 | 职责 |
|:---|:---|:---|
| `Platform` | 枚举 | 业务平台。**不含 provider**,直连与聚合器映射到同一值 |
| `ChannelProvider` | 枚举 | 接入通道:DIRECT / LINGXING / TEAPPLIX / CUSTOM |
| `Capability` | 枚举 | 能力枚举,适配器声明、门面校验 |
| `FulfillmentMode` | 枚举 | A/C/D 三种履约模式(B 平台仓只读,不在枚举内) |
| `Platform` | 枚举(shared) | 业务平台。**不含 provider**,直连与聚合器映射到同一值 |
| `ChannelProvider` | 枚举(shared) | 接入通道:DIRECT / LINGXING / TEAPPLIX / CUSTOM |
| `Capability` | 枚举(shared) | 能力枚举,适配器声明、门面校验 |
| `FulfillmentMode` | 枚举(shared) | A/C/D 三种履约模式(B 平台仓只读,不在枚举内) |
| `ProductSyncStrategy` | 枚举 | 增量 / 全量 diff / 报告(放在 `model.product`) |
| `AccountKey` | 标识 | `provider + platform + omsStoreId`,所有调用的隔离维度 |
| `ChannelAccount` | 配置 | 渠道账户配置。只存 `credentialRef`,**不存密钥** |
| `CanonicalKeys` | 工具 | 三级标识与指纹计算,见下方「标识体系」 |
| `PlatformTime` | 值对象 | 三轴时间:UTC 真值 + 市场当地 + 北京时间 |
| `Money` | 值对象 | `BigDecimal + Currency`,跨币种运算直接拒绝 |
| `CanonicalKeys` | 工具(shared) | 三级标识与指纹计算,见下方「标识体系」 |
| `PlatformTime` | 值对象(shared) | 三轴时间:UTC 真值 + 市场当地 + 北京时间 |
| `Money` | 值对象(shared) | `BigDecimal + Currency`,跨币种运算直接拒绝 |
| `SalesOrder` / `OrderLine` | 实体 | 3P 销售订单 |
| `ProductListing` | 实体 | 商品 / Listing |
| `SalesOrderQuery` / `ProductQuery` | 查询 | 查询条件(时间窗 + 分页游标) |
| `SalesOrderRef` / `ProductRef` | 引用 | 详情入参。**不能用裸 String**,否则订单+商品接口签名冲突 |
| `Page<T>` | 载体 | 分页载体,`nextCursor == null` 表示结束 |
| `Page<T>` | 载体(shared) | 分页载体,`nextCursor == null` 表示结束 |
### `capability` —— 能力接口
### `channel.capability` —— 能力接口
适配器实现哪些接口就声明哪些能力;未实现的方法抛 `UnsupportedCapabilityException`,不静默返回空。
@ -104,10 +324,11 @@ common.ecommerce @@ -104,10 +324,11 @@ common.ecommerce
| `AggregatorCapable` | 聚合器扩展:`listSubChannels(account)`,按子平台细化能力 |
| `SalesOrderCapable` | `pull(ctx, query)` / `get(ctx, SalesOrderRef)` |
| `ProductCapable` | `syncStrategy()` / `pull(ctx, query)` / `get(ctx, ProductRef)` |
| `CapabilityReport` | 能力报告:`supports()` / `supported()` / `unsupported()` |
| `SalesOrders` / `Products` | 门面持有的视图,调用前做能力检查 |
| `SettlementCapable` / `OutboundCapable` / `OutboundOrderCapable` / `ShippingLabelCapable` / `ShipmentReviewCapable` / `OrderEditCapable` / `AfterSaleCapable` | 账单 / 快速出库 / 出库单 / 面单 / 审核发货 / 订单编辑 / 售后 |
| `CapabilityReport` / `AdapterCapabilityReport` | 能力报告:`supports()` / `supported()` / `unsupported()` |
| `SalesOrders` / `Products` / `Outbounds` / `Settlements` / `AfterSales` | 门面持有的视图,调用前做能力检查 |
### `error` —— 异常体系
### `shared.error` —— 异常体系
全部继承 `ChannelException`,带 `platform / provider / omsStoreId / operation / requestId / platformCode / retryable / rawResponse`。
@ -128,39 +349,41 @@ common.ecommerce @@ -128,39 +349,41 @@ common.ecommerce
**同名类** `Responses` 有两个:`http.Responses`(状态码 → 异常)与 `testkit.Responses`(快捷构造响应)。测试里注意 import 哪个。
### `sdk` —— 门面与上下文
### `channel.sdk` —— 门面与上下文
| 类 | 职责 |
|:---|:---|
| `ChannelContext` | 单次调用上下文:`account` + `connection` + `requestId` + `clock`。**由 SDK 创建,适配器不得自造** |
| `AdapterFactory` | 适配器工厂:`adapterId()` / `provider()` / `platforms()` / `create(AdapterConfig)` |
| `ProviderResolver` | 按 `AccountKey` 解析适配器,不自动选路 |
| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()`;`build()` 校验必需项 |
| `ChannelSdk` | 统一门面:`capabilities()` / `salesOrders` / `products` / `settlements` / `afterSales` / `outbounds` / `writes()`;`build()` 校验必需项 |
| `ChannelConnection` | 一次调用的连接信息(端点 + 凭据)。**由调用方每次传入,SDK 不保存** |
| `CallSupport` | 门面调用的统一包装:能力检查 + 审计回调 |
### `idempotency` —— 写操作幂等
### `shared.idempotency` —— 写操作幂等
| 类 | 职责 |
|:---|:---|
| `WriteScope` | 一次写操作的维度:`provider + platform + omsStoreId + externalStoreId + action + businessRef` |
| `WriteResult` | 执行结果:`EXECUTED` / `ALREADY_COMPLETED`(回放,不算失败) |
| `IdempotencyGuard` | 双锁守卫:业务键(跨 provider)+ provider 请求键(单 provider 内重试) |
| `WriteAudit` | 写操作审计留痕 |
### `sync` —— 增量同步
### `channel.sync` + `shared.sync` —— 增量同步
| 类 | 职责 |
|:---|:---|
| `SyncSpec` | 同步维度:`provider + accountKey + stream + overlap` |
| `SyncResult` | 单次结果:页数、条目数、水位线是否推进 |
| `SyncEngine` | 分页循环 + 落库 + 水位线推进 |
| `SyncSpec`(shared) | 同步维度:`provider + accountKey + stream + overlap` |
| `SyncResult`(shared) | 单次结果:页数、条目数、水位线是否推进 |
| `SyncEngine`(channel) | 分页循环 + 落库 + 水位线推进 |
### `spi` —— 宿主扩展点
### `shared.spi` + `channel.spi` —— 宿主扩展点
**SDK 只定义,宿主实现。SDK 内部不碰 JDBC / Redis / MQ。**
| SPI | 作用 | 典型实现 |
|:---|:---|:---|
| `ChannelAccountRepository` | 读渠道账户 | MySQL |
| `ChannelAccountRepository`(channel) | 读渠道账户 | MySQL |
| `SecretProvider` | **已不再使用**:凭据改由调用方经 `ChannelConnection` 传入 | — |
| `ChannelSecret` | 凭据载体(appKey/appSecret/clientId/… + endpointBaseUrl),`fingerprint()` 供日志 |
| `TokenStore` | access/refresh token 读写 | MySQL / Redis(加密) |
@ -168,7 +391,7 @@ common.ecommerce @@ -168,7 +391,7 @@ common.ecommerce
| `SyncCursorStore` | 水位线读写 | MySQL |
| `IdempotencyStore` | 幂等键抢占与结果记录;`claim` 必须原子 | MySQL / Redis |
| `IdempotencyClaim` / `IdempotencyRecord` / `IdempotencyStatus` | 抢占结果、记录、四态(IN_PROGRESS / SUCCEEDED / FAILED_RETRYABLE / FAILED_FINAL) | — |
| `Sink` | 领域对象落库(当前 `upsertSalesOrders` / `upsertProducts`) | MyBatis |
| `Sink`(channel) | 领域对象落库(当前 `upsertSalesOrders` / `upsertProducts`) | MyBatis |
| `LockProvider` | token 刷新防击穿、账户级互斥 | Redisson / DB |
### `http` —— 出入网层
@ -194,14 +417,64 @@ common.ecommerce @@ -194,14 +417,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` | 工厂注册 |
---
@ -238,9 +511,10 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w @@ -238,9 +511,10 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w
### 状态说明
`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders(key, conn)` / `products(key, conn)` / `writes()` 已挂接,
`build()` 做必需项校验(缺 `accountRepository`、缺适配器都会抛异常)。
目前仅接入了订单与商品两种能力,其余能力随适配器逐个补齐。
`ChannelSdk` 门面已可用:`capabilities()` / `salesOrders` / `products` / `settlements` /
`afterSales` / `outbounds` / `writes()` 均已挂接,`build()` 做必需项校验(缺 `accountRepository`、
缺适配器都会抛异常)。领星适配器当前声明订单、商品、账单、标发、退货、出库单、面单、审核发货、
订单编辑能力,能力再按子平台细化(见 3.4)。
两条调用路径都可以用:**门面**(3.3)适合业务层;**适配器 + SyncEngine**(3.1 / 3.2)
适合需要自己控制时间窗、翻页与落库的场景。
@ -252,24 +526,25 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w @@ -252,24 +526,25 @@ CanonicalKeys.providerRequestKey(ChannelProvider.DIRECT, Platform.WALMART_SC, "w
```java
// 1) 宿主实现 SPI
ChannelAccountRepository accountRepo = ...; // MySQL
SecretProvider secretProvider = ...; // KMS
TokenStore tokenStore = ...; // 加密存储
LockProvider lockProvider = ...; // Redisson / DB
// 2) 创建适配器(也可经 LingxingAdapterFactory.create)
LingxingAdapter adapter = new LingxingAdapter(
LingxingConstants.DEFAULT_BASE_URL,
new OkHttpTransport("common-ecommerce/1.0.0 (lingxing)"),
new JacksonJsonCodec(),
secretProvider, tokenStore, lockProvider,
tokenStore, lockProvider,
Clock.systemUTC());
// 3) 取账户 → 组装调用上下文
// 3) 取账户 + 连接 → 组装调用上下文
ChannelAccount account = accountRepo
.findByKey("LINGXING", "WALMART_SC", "oms-wm-001")
.orElseThrow(() -> new IllegalStateException("account not configured"));
ChannelContext ctx = ChannelContext.of(account, UUID.randomUUID().toString(), Clock.systemUTC());
ChannelConnection connection = ChannelConnection.of(ChannelProvider.LINGXING,
LingxingConstants.PRODUCTION_BASE_URL, secret); // 凭据由调用方每次传入
ChannelContext ctx = ChannelContext.of(account, connection, UUID.randomUUID().toString(), Clock.systemUTC());
// 4) 调用
Page<SalesOrder> page = adapter.pull(ctx, SalesOrderQuery.builder()
@ -328,7 +603,7 @@ ChannelSdk sdk = ChannelSdk.builder() @@ -328,7 +603,7 @@ ChannelSdk sdk = ChannelSdk.builder()
.accountRepository(accountRepo) // 必需
.clock(Clock.systemUTC()) // 可选,默认 UTC
.idempotencyStore(idempotencyStore) // 写操作用;不注入则 writes() 失败
.register(new LingxingAdapterFactory(secretProvider, tokenStore, lockProvider, Clock.systemUTC()))
.register(new LingxingAdapterFactory(tokenStore, lockProvider, Clock.systemUTC()))
.build(); // 缺必需项立刻抛异常
AccountKey key = AccountKey.of(ChannelProvider.LINGXING, Platform.WALMART_SC, "oms-wm-001");
@ -411,9 +686,9 @@ result.outcome(); // EXECUTED / ALREADY_COMPLETED @@ -411,9 +686,9 @@ result.outcome(); // EXECUTED / ALREADY_COMPLETED
### 4.1 新增一个直连平台
以新增 `amazon-sc` 为例,**不改 core、不改门面、不改宿主**。
以新增 `amazon-sc` 为例,**不改 channel、不改门面、不改宿主**。
**第 1 步:建模块**,`pom.xml` 只依赖 core 与 http。
**第 1 步:建模块**,`pom.xml` 只依赖 channel、http 与 shared。
**第 2 步:实现能力接口**。只实现真正支持的,其余不实现:
@ -499,9 +774,9 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC @@ -499,9 +774,9 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC
| 不做 | 原因 |
|:---|:---|
| `core` 引 Spring / JDBC / Redis / MQ | SDK 要能脱离宿主单测 |
| `channel` 引 Spring / JDBC / Redis / MQ | SDK 要能脱离宿主单测 |
| 把平台端点、字段名做成配置表 | 协议是代码,配置化会让线上线下跑不同协议 |
| 密钥写入 `ChannelAccount` | 只能存 `credentialRef`,密钥走 `SecretProvider` |
| 密钥写入 `ChannelAccount` | 只能存 `credentialRef`,密钥经 `ChannelConnection` 在调用时传入 |
| provider 进 canonicalKey | 直连/聚合器切换会产生重复实体 |
| 在适配器里 `new Thread` / 定时器 | 调度归宿主,SDK 不许私起线程 |
| 能力声明与实际实现不一致 | 验收项,缺失能力必须显式抛异常 |
@ -528,20 +803,21 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC @@ -528,20 +803,21 @@ public final class MyAggregatorAdapter implements SalesOrderCapable, AggregatorC
src/test/resources/fixtures/{platform}/{operation}/{case}.json
```
例:`lingxing/src/test/resources/fixtures/lingxing/orderList/success.json`
例:`lingxing/src/test/resources/fixtures/lingxing/walmartListing/success.json`
每个平台至少准备「正常 + 异常」两套。
### 写法
```java
// 联调直接用真实接口,见 LingxingLiveSmokeTest
// 联调直接用真实接口,见 LingxingLiveSmokeTest;
// 契约测试用 RecordingTransport + 夹具,不联网
LingxingAdapter adapter = new LingxingAdapter(LingxingConstants.DEFAULT_BASE_URL, transport,
new JacksonJsonCodec(), accounts, tokenStore, locks,
LingxingAdapter adapter = new LingxingAdapter(transport,
new JacksonJsonCodec(), tokenStore, locks,
Clock.fixed(Instant.parse("2026-10-29T00:00:00Z"), ZoneOffset.UTC));
ChannelContext ctx = ChannelContext.of(account, "req-1", clock);
ChannelContext ctx = ChannelContext.of(account, connection, "req-1", clock);
Page<SalesOrder> page = adapter.pull(ctx, SalesOrderQuery.builder()
.updatedAfter(Instant.parse("2026-10-25T00:00:00Z"))
.updatedBefore(Instant.parse("2026-10-26T00:00:00Z"))
@ -556,12 +832,12 @@ assertTrue(last.body().contains("\"platform_code\":10008")); @@ -556,12 +832,12 @@ assertTrue(last.body().contains("\"platform_code\":10008"));
assertEquals("PO-123456789", page.items().get(0).channelOrderId());
```
完整示例见 `lingxing/src/test/java/.../LingxingAdapterTest.java`。
完整示例见 `lingxing/src/test/java/.../LingxingSdkListingCallTest.java`。
直连抽象与幂等守卫不用真平台也能测:
```java
// core 抽象没被聚合器带偏:单平台、能力并集、游标翻页
// channel 抽象没被聚合器带偏:单平台、能力并集、游标翻页
FakeDirectAdapter adapter = FakeDirectAdapter.builder().orders(5).pageSize(2).build();
// 双锁幂等:第二次调用回放,平台只真正写一次
@ -577,7 +853,7 @@ assertEquals(1, adapter.writeCallCount()); @@ -577,7 +853,7 @@ assertEquals(1, adapter.writeCallCount());
```bash
mvn test # 全部
mvn -pl lingxing test # 单模块
mvn -pl lingxing -Dtest=LingxingAdapterTest test
mvn -pl lingxing -Dtest=LingxingSdkListingCallTest test
```
---

31
channel/pom.xml

@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-ecommerce-channel</artifactId>
<description>渠道域:领域模型、能力接口、门面、同步管道(无平台代码)</description>
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

6
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.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import java.util.EnumSet;

16
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.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 售后能力:拉取售后订单(退款 / 退货 / 换货)。

20
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.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 门面持有的售后视图。调用前做能力检查,缺失时显式拒绝。

10
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.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.Platform;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.capability;
package common.ecommerce.channel.capability;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.model.Capability;
import java.util.EnumSet;

0
core/src/main/java/common/ecommerce/capability/InboundReceiptCapable.java → channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java

0
core/src/main/java/common/ecommerce/capability/InboundShipmentCapable.java → channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java

0
core/src/main/java/common/ecommerce/capability/Inbounds.java → channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java

10
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.model.Capability;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.fulfillment.OrderEditRequest;
import common.ecommerce.channel.model.fulfillment.OrderEditResult;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

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;

10
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.model.support.Page;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.channel.model.fulfillment.OutboundOrder;
import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 销售出库单(仓库出库单据)查询能力。

34
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;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.LabelQuery;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.model.fulfillment.OutboundPackage;
import common.ecommerce.model.fulfillment.OutboundResult;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.model.fulfillment.ShippingLabel;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
package common.ecommerce.channel.capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.fulfillment.LabelQuery;
import common.ecommerce.channel.model.fulfillment.OutboundOrder;
import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.channel.model.fulfillment.OutboundPackage;
import common.ecommerce.channel.model.fulfillment.OutboundResult;
import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.channel.model.fulfillment.ShippingLabel;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.capability;
package common.ecommerce.channel.capability;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.util.EnumSet;
import java.util.Set;

16
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.model.Capability;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
import common.ecommerce.model.product.ProductSyncStrategy;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.channel.model.product.ProductRef;
import common.ecommerce.channel.model.product.ProductSyncStrategy;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 商品 / Listing 能力。

22
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.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.channel.model.product.ProductRef;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/** 门面持有的商品视图。 */
public final class Products {

16
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.error.ChannelException;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.Capability;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.model.order.SalesOrderRef;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 3P 销售订单能力:消费者订单。

30
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;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
package common.ecommerce.channel.capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.fulfillment.OrderEditRequest;
import common.ecommerce.channel.model.fulfillment.OrderEditResult;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.model.order.SalesOrderRef;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

10
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.model.support.Page;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.channel.model.settlement.SettlementQuery;
import common.ecommerce.channel.model.settlement.SettlementTransaction;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 结算 / 账单能力:拉取平台结算交易明细。

20
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.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.settlement.SettlementQuery;
import common.ecommerce.channel.model.settlement.SettlementTransaction;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/**
* 门面持有的结算视图。调用前做能力检查,缺失时显式拒绝。

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;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.model.account;
package common.ecommerce.channel.model.account;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.support.CanonicalKeys;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.support.CanonicalKeys;
import java.util.Objects;

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

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.model.account;
package common.ecommerce.channel.model.account;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.util.ArrayList;
import java.util.Collections;
@ -11,8 +11,8 @@ import java.util.Objects; @@ -11,8 +11,8 @@ import java.util.Objects;
/**
* 渠道账户。一个 omsStoreId 可绑定多个 provider 账户。
*
* <p>凭证不落配置:本对象只保存 {@code credentialRef},真实密钥由宿主
* {@code SecretProvider} 按引用取出。</p>
* <p>凭证不落配置:本对象只保存 {@code credentialRef}(账户维度的标识),
* 真实密钥由调用方在每次调用时经 {@code ChannelConnection} 传入,SDK 不保存、不读取。</p>
*/
public final class ChannelAccount {
@ -31,7 +31,7 @@ public final class ChannelAccount { @@ -31,7 +31,7 @@ public final class ChannelAccount {
/** 市场 ID 列表;单市场平台可为空列表。 */
private final List<String> marketplaceIds;
/** 凭证引用(SecretProvider 的键),不是密钥本身。 */
/** 凭证引用(宿主侧密钥条目的标识),不是密钥本身;真实密钥经 ChannelConnection 传入。 */
private final String credentialRef;
/** 市场时区 IANA ID,如 America/Los_Angeles。 */

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.model.aftersale;
package common.ecommerce.channel.model.aftersale;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;

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;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.model.fulfillment;
package common.ecommerce.channel.model.fulfillment;
import common.ecommerce.model.support.Money;
import common.ecommerce.shared.support.Money;
import java.util.Objects;

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;

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

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

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.model.order;
package common.ecommerce.channel.model.order;
import common.ecommerce.model.support.Money;
import common.ecommerce.shared.support.Money;
import java.util.Objects;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.model.order;
package common.ecommerce.channel.model.order;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;

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;

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.model.product;
package common.ecommerce.channel.model.product;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.util.ArrayList;
import java.util.Collections;

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;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.model.settlement;
package common.ecommerce.channel.model.settlement;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.util.Objects;

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.sdk;
package common.ecommerce.channel.sdk;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.channel.capability.PlatformAdapter;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.util.EnumSet;
@ -37,7 +37,7 @@ public interface AdapterFactory { @@ -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 {

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.sdk;
package common.ecommerce.channel.sdk;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.audit.CallRecord;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.sdk;
package common.ecommerce.channel.sdk;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.shared.spi.ChannelSecret;
import java.util.Objects;

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

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package common.ecommerce.sdk;
package common.ecommerce.channel.sdk;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.spi.ChannelSecret;
import java.time.Clock;
import java.util.Objects;

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

@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
package common.ecommerce.sdk;
import common.ecommerce.model.Platform;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.Slf4jCallObserver;
import common.ecommerce.capability.AdapterCapabilityReport;
import common.ecommerce.capability.AfterSales;
import common.ecommerce.capability.AggregatorCapable;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.Inbounds;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.capability.Products;
import common.ecommerce.capability.SalesOrders;
import common.ecommerce.capability.Outbounds;
import common.ecommerce.capability.Settlements;
import common.ecommerce.idempotency.IdempotencyGuard;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.spi.ChannelAccountRepository;
import common.ecommerce.sdk.AdapterFactory.AdapterConfig;
import common.ecommerce.spi.IdempotencyStore;
package common.ecommerce.channel.sdk;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.channel.capability.AdapterCapabilityReport;
import common.ecommerce.channel.capability.AfterSales;
import common.ecommerce.channel.capability.AggregatorCapable;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.capability.CapabilityReport;
import common.ecommerce.channel.capability.PlatformAdapter;
import common.ecommerce.channel.capability.Products;
import common.ecommerce.channel.capability.SalesOrders;
import common.ecommerce.channel.capability.Outbounds;
import common.ecommerce.channel.capability.Settlements;
import common.ecommerce.shared.idempotency.IdempotencyGuard;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.spi.ChannelAccountRepository;
import common.ecommerce.channel.sdk.AdapterFactory.AdapterConfig;
import common.ecommerce.shared.spi.IdempotencyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -203,18 +202,6 @@ public final class ChannelSdk implements ProviderResolver { @@ -203,18 +202,6 @@ public final class ChannelSdk implements ProviderResolver {
}
/**
* 入库视图:平台仓入库货件与 FBA 到货接收明细(只读)。
*
* <p>能力检查发生在 {@code shipments()} / {@code receipts()} 调用时;
* 适配器未实现对应接口或未声明能力时抛
* {@code UnsupportedCapabilityException}。</p>
*/
public Inbounds inbounds(AccountKey key, ChannelConnection connection) {
ChannelAccount account = requireAccount(key);
return new Inbounds(resolve(key), account, newContext(account, connection), callObserver);
}
/**
* 聚合器的子店铺列表(如领星下已授权的亚马逊 / 沃尔玛店铺)。
*
* <p>典型用途是<b>首次接入</b>:把 platformCode + externalStoreId 拉下来,

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;

8
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.model.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.order.SalesOrder;
/**
* 领域对象落库 SPI。SDK 只调用,不碰数据库。

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

@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
package common.ecommerce.sync;
package common.ecommerce.channel.sync;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.spi.Sink;
import common.ecommerce.spi.SyncCursorStore;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.sync.SyncResult;
import common.ecommerce.shared.sync.SyncSpec;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.spi.Sink;
import common.ecommerce.shared.spi.SyncCursorStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.audit.CallRecord;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.sdk.ChannelConnection;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.ChannelSecret;
package common.ecommerce.channel.capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.fulfillment.OrderEditRequest;
import common.ecommerce.channel.model.fulfillment.OrderEditResult;
import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.channel.sdk.ChannelConnection;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Clock;

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

@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
package common.ecommerce.sdk;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.audit.CallRecord;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.spi.ChannelSecret;
package common.ecommerce.channel.sdk;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Instant;

80
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;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.error.ChannelException;
import common.ecommerce.idempotency.WriteResult;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.Platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.ChannelAccountRepository;
package common.ecommerce.channel.sdk;
import common.ecommerce.channel.capability.CapabilityReport;
import common.ecommerce.channel.capability.PlatformAdapter;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.idempotency.WriteResult;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.channel.spi.ChannelAccountRepository;
import org.junit.jupiter.api.Test;
import java.util.Collections;
@ -37,10 +37,10 @@ class ChannelSdkTest { @@ -37,10 +37,10 @@ class ChannelSdkTest {
/** 连接信息由调用方每次传入,测试里固定一份。 */
private static final ChannelConnection CONNECTION = ChannelConnection.of(
"https://api.example.com",
common.ecommerce.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
common.ecommerce.shared.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
/** 假直连适配器:单平台,只有订单能力。 */
static final class FakeDirectAdapter implements common.ecommerce.capability.SalesOrderCapable {
static final class FakeDirectAdapter implements common.ecommerce.channel.capability.SalesOrderCapable {
@Override
public String adapterId() {
@ -68,7 +68,7 @@ class ChannelSdkTest { @@ -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
@ -197,42 +197,42 @@ class ChannelSdkTest { @@ -197,42 +197,42 @@ class ChannelSdkTest {
@Test
void writesUseInjectedStore() {
// core 不能依赖 testkit,这里用最小本地替身验证门面装配
common.ecommerce.spi.IdempotencyStore store =
new common.ecommerce.spi.IdempotencyStore() {
private final java.util.Map<String, common.ecommerce.spi.IdempotencyRecord> records =
new java.util.LinkedHashMap<String, common.ecommerce.spi.IdempotencyRecord>();
common.ecommerce.shared.spi.IdempotencyStore store =
new common.ecommerce.shared.spi.IdempotencyStore() {
private final java.util.Map<String, common.ecommerce.shared.spi.IdempotencyRecord> records =
new java.util.LinkedHashMap<String, common.ecommerce.shared.spi.IdempotencyRecord>();
@Override
public common.ecommerce.spi.IdempotencyClaim claim(String key, String owner,
public common.ecommerce.shared.spi.IdempotencyClaim claim(String key, String owner,
ChannelProvider provider, java.time.Instant now, long ttlSeconds) {
common.ecommerce.spi.IdempotencyRecord existing = records.get(key);
if (existing != null && existing.status() == common.ecommerce.spi.IdempotencyStatus.SUCCEEDED) {
return common.ecommerce.spi.IdempotencyClaim.of(
common.ecommerce.spi.IdempotencyClaim.Outcome.SUCCEEDED, existing);
common.ecommerce.shared.spi.IdempotencyRecord existing = records.get(key);
if (existing != null && existing.status() == common.ecommerce.shared.spi.IdempotencyStatus.SUCCEEDED) {
return common.ecommerce.shared.spi.IdempotencyClaim.of(
common.ecommerce.shared.spi.IdempotencyClaim.Outcome.SUCCEEDED, existing);
}
records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
common.ecommerce.spi.IdempotencyStatus.IN_PROGRESS, provider, owner, null, now));
return common.ecommerce.spi.IdempotencyClaim.acquire();
records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
common.ecommerce.shared.spi.IdempotencyStatus.IN_PROGRESS, provider, owner, null, now));
return common.ecommerce.shared.spi.IdempotencyClaim.acquire();
}
@Override
public void complete(String key, String owner, String resultRef, java.time.Instant now) {
common.ecommerce.spi.IdempotencyRecord current = records.get(key);
records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
common.ecommerce.spi.IdempotencyStatus.SUCCEEDED, current.provider(),
common.ecommerce.shared.spi.IdempotencyRecord current = records.get(key);
records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
common.ecommerce.shared.spi.IdempotencyStatus.SUCCEEDED, current.provider(),
owner, resultRef, now));
}
@Override
public void fail(String key, String owner, boolean retryable, java.time.Instant now) {
common.ecommerce.spi.IdempotencyRecord current = records.get(key);
records.put(key, common.ecommerce.spi.IdempotencyRecord.of(key,
common.ecommerce.spi.IdempotencyStatus.FAILED_RETRYABLE,
common.ecommerce.shared.spi.IdempotencyRecord current = records.get(key);
records.put(key, common.ecommerce.shared.spi.IdempotencyRecord.of(key,
common.ecommerce.shared.spi.IdempotencyStatus.FAILED_RETRYABLE,
current.provider(), owner, null, now));
}
@Override
public java.util.Optional<common.ecommerce.spi.IdempotencyRecord> get(String key) {
public java.util.Optional<common.ecommerce.shared.spi.IdempotencyRecord> get(String key) {
return java.util.Optional.ofNullable(records.get(key));
}
};
@ -243,7 +243,7 @@ class ChannelSdkTest { @@ -243,7 +243,7 @@ class ChannelSdkTest {
.register(new FakeDirectAdapter())
.build();
common.ecommerce.idempotency.WriteScope scope = common.ecommerce.idempotency.WriteScope.of(
common.ecommerce.shared.idempotency.WriteScope scope = common.ecommerce.shared.idempotency.WriteScope.of(
ChannelProvider.DIRECT, Platform.WALMART_SC, "oms-wm-001", "wm-seller-01",
"markShipped", "PO-1:pkg-1");
assertEquals(WriteResult.Outcome.EXECUTED,

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

@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
package common.ecommerce.sdk;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.audit.CallRecord;
import common.ecommerce.audit.Slf4jCallObserver;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.spi.ChannelSecret;
package common.ecommerce.channel.sdk;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.channel.capability.CapabilityReport;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Clock;
@ -246,7 +246,7 @@ class RequestIdAndCoverageTest { @@ -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-core</artifactId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>

4
http/src/main/java/common/ecommerce/http/OkHttpTransport.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.http;
import common.ecommerce.error.TransientException;
import common.ecommerce.shared.error.TransientException;
import java.util.concurrent.TimeUnit;
@ -60,7 +60,7 @@ public final class OkHttpTransport implements HttpTransport { @@ -60,7 +60,7 @@ public final class OkHttpTransport implements HttpTransport {
return HttpResponse.of(resp.code(), headers, respBody, latency);
} catch (java.io.IOException e) {
throw TransientException.class.cast(new TransientException(
common.ecommerce.error.ChannelException.builder()
common.ecommerce.shared.error.ChannelException.builder()
.message("http transport failed: " + e.getMessage())
.operation(request.operation())
.retryable(true), e));

10
http/src/main/java/common/ecommerce/http/Responses.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.http;
import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.RateLimitException;
import common.ecommerce.error.TransientException;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.RateLimitException;
import common.ecommerce.shared.error.TransientException;
/**
* 响应判定与重试分类。
@ -40,7 +40,7 @@ public final class Responses { @@ -40,7 +40,7 @@ public final class Responses {
if (response.isServerError()) {
throw new TransientException(b.retryable(true), null);
}
throw new common.ecommerce.error.ValidationException(b);
throw new common.ecommerce.shared.error.ValidationException(b);
}
static long parseRetryAfterMillis(String raw) {

2
http/src/main/java/common/ecommerce/http/Signer.java

@ -6,5 +6,5 @@ package common.ecommerce.http; @@ -6,5 +6,5 @@ package common.ecommerce.http;
public interface Signer {
/** 在请求上补齐签名相关的 header / query。 */
HttpRequest sign(HttpRequest request, common.ecommerce.spi.ChannelSecret secret);
HttpRequest sign(HttpRequest request, common.ecommerce.shared.spi.ChannelSecret secret);
}

14
http/src/main/java/common/ecommerce/http/TokenManager.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.http;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.spi.LockProvider;
import common.ecommerce.spi.TokenStore;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.spi.LockProvider;
import common.ecommerce.shared.spi.TokenStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -139,9 +139,9 @@ public abstract class TokenManager { @@ -139,9 +139,9 @@ public abstract class TokenManager {
}
}
private static common.ecommerce.error.AuthException authError(String message) {
return new common.ecommerce.error.AuthException(
common.ecommerce.error.ChannelException.builder()
private static common.ecommerce.shared.error.AuthException authError(String message) {
return new common.ecommerce.shared.error.AuthException(
common.ecommerce.shared.error.ChannelException.builder()
.message(message)
.operation("token.refresh"));
}

12
http/src/test/java/common/ecommerce/http/ResponsesTest.java

@ -14,14 +14,14 @@ class ResponsesTest { @@ -14,14 +14,14 @@ class ResponsesTest {
@Test
void authMapsToAuthException() {
assertThrows(common.ecommerce.error.AuthException.class,
assertThrows(common.ecommerce.shared.error.AuthException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(401, null, "{}", 1), "op"));
}
@Test
void rateLimitCarriesRetryAfter() {
common.ecommerce.error.RateLimitException ex = assertThrows(
common.ecommerce.error.RateLimitException.class,
common.ecommerce.shared.error.RateLimitException ex = assertThrows(
common.ecommerce.shared.error.RateLimitException.class,
() -> Responses.throwIfNotSuccess(
HttpResponse.of(429, java.util.Collections.singletonMap("Retry-After", "3"), "", 1), "op"));
assertEquals(3000L, ex.retryAfterMillis());
@ -29,15 +29,15 @@ class ResponsesTest { @@ -29,15 +29,15 @@ class ResponsesTest {
@Test
void serverErrorIsRetryable() {
common.ecommerce.error.TransientException ex = assertThrows(
common.ecommerce.error.TransientException.class,
common.ecommerce.shared.error.TransientException ex = assertThrows(
common.ecommerce.shared.error.TransientException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(503, null, "", 1), "op"));
assertEquals(true, ex.retryable());
}
@Test
void badRequestIsValidation() {
assertThrows(common.ecommerce.error.ValidationException.class,
assertThrows(common.ecommerce.shared.error.ValidationException.class,
() -> Responses.throwIfNotSuccess(HttpResponse.of(400, null, "", 1), "op"));
}
}

12
http/src/test/java/common/ecommerce/http/TokenManagerTest.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.http;
import common.ecommerce.error.AuthException;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -100,7 +100,7 @@ class TokenManagerTest { @@ -100,7 +100,7 @@ class TokenManagerTest {
TokenManager failing = new TokenManager(tokenStore, locks, clock, 600) {
@Override
protected AccessToken refresh(ChannelSecret secret, AccessToken previous) {
throw new AuthException(common.ecommerce.error.ChannelException.builder()
throw new AuthException(common.ecommerce.shared.error.ChannelException.builder()
.message("app not exist").operation("token.refresh"));
}
};
@ -153,7 +153,7 @@ class TokenManagerTest { @@ -153,7 +153,7 @@ class TokenManagerTest {
void advance(Duration d) { now = now.plus(d); }
}
static final class LocalTokenStore implements common.ecommerce.spi.TokenStore {
static final class LocalTokenStore implements common.ecommerce.shared.spi.TokenStore {
private final java.util.Map<String, AccessToken> tokens = new java.util.HashMap<String, AccessToken>();
@Override public java.util.Optional<AccessToken> get(String key) {
@ -163,7 +163,7 @@ class TokenManagerTest { @@ -163,7 +163,7 @@ class TokenManagerTest {
@Override public void remove(String key) { tokens.remove(key); }
}
static final class LocalLockProvider implements common.ecommerce.spi.LockProvider {
static final class LocalLockProvider implements common.ecommerce.shared.spi.LockProvider {
private final java.util.Set<String> held = new java.util.HashSet<String>();
private final java.util.Map<String, Integer> counts = new java.util.HashMap<String, Integer>();

6
lingxing/pom.xml

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

2
lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.lingxing;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Platform;
/**
* 领星协议常量与 platform_code 映射。
*

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

@ -1,5 +1,17 @@ @@ -1,5 +1,17 @@
package common.ecommerce.lingxing.adapter;
import common.ecommerce.channel.capability.AfterSaleCapable;
import common.ecommerce.channel.capability.AggregatorCapable;
import common.ecommerce.channel.capability.OrderEditCapable;
import common.ecommerce.channel.capability.OutboundCapable;
import common.ecommerce.channel.capability.OutboundOrderCapable;
import common.ecommerce.channel.capability.ProductCapable;
import common.ecommerce.channel.capability.SalesOrderCapable;
import common.ecommerce.channel.capability.SettlementCapable;
import common.ecommerce.channel.capability.ShipmentReviewCapable;
import common.ecommerce.channel.capability.ShippingLabelCapable;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.capability.AfterSaleCapable;
import common.ecommerce.capability.AggregatorCapable;
import common.ecommerce.capability.InboundReceiptCapable;
@ -35,40 +47,40 @@ import common.ecommerce.lingxing.platform.wms.OrderEditSource; @@ -35,40 +47,40 @@ import common.ecommerce.lingxing.platform.wms.OrderEditSource;
import common.ecommerce.lingxing.platform.wms.ShipmentReviewSource;
import common.ecommerce.lingxing.platform.wms.WmsLabelSource;
import common.ecommerce.lingxing.platform.wms.WmsOutboundOrderSource;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.fulfillment.LabelQuery;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.model.fulfillment.OutboundPackage;
import common.ecommerce.model.fulfillment.OutboundResult;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.model.fulfillment.ShippingLabel;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.channel.model.order.SalesOrderRef;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleQuery;
import common.ecommerce.channel.model.fulfillment.LabelQuery;
import common.ecommerce.channel.model.fulfillment.OrderEditRequest;
import common.ecommerce.channel.model.fulfillment.OrderEditResult;
import common.ecommerce.channel.model.fulfillment.OutboundOrder;
import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.channel.model.fulfillment.OutboundPackage;
import common.ecommerce.channel.model.fulfillment.OutboundResult;
import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.channel.model.fulfillment.ShippingLabel;
import common.ecommerce.model.inbound.InboundReceipt;
import common.ecommerce.model.inbound.InboundReceiptQuery;
import common.ecommerce.model.inbound.InboundShipment;
import common.ecommerce.model.inbound.InboundShipmentQuery;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;
import common.ecommerce.model.product.ProductSyncStrategy;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.spi.LockProvider;
import common.ecommerce.spi.TokenStore;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.channel.model.product.ProductRef;
import common.ecommerce.channel.model.product.ProductSyncStrategy;
import common.ecommerce.channel.model.settlement.SettlementQuery;
import common.ecommerce.channel.model.settlement.SettlementTransaction;
import common.ecommerce.shared.support.Page;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.spi.LockProvider;
import common.ecommerce.shared.spi.TokenStore;
import java.time.Clock;
import java.util.EnumSet;

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

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
package common.ecommerce.lingxing.adapter;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.sdk.AdapterFactory;
import common.ecommerce.spi.LockProvider;
import common.ecommerce.spi.TokenStore;
import common.ecommerce.channel.capability.PlatformAdapter;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.sdk.AdapterFactory;
import common.ecommerce.shared.spi.LockProvider;
import common.ecommerce.shared.spi.TokenStore;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.time.Clock;

6
lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.lingxing.auth;
import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.HttpTransport;
@ -9,7 +9,7 @@ import common.ecommerce.http.JsonCodec; @@ -9,7 +9,7 @@ import common.ecommerce.http.JsonCodec;
import common.ecommerce.http.Responses;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.shared.spi.AccessToken;
import java.time.Clock;
import java.time.Instant;

2
lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java

@ -9,7 +9,7 @@ import lombok.Setter; @@ -9,7 +9,7 @@ import lombok.Setter;
* 领星订单的交易信息({@code data.list[].transaction_info[]})。
*
* <p>金额是带币种符号的字符串(如 {@code "¥49.16"}、{@code "-¥0.98"}),
* 由 mapper 清洗后再转 {@link common.ecommerce.model.support.Money}。</p>
* 由 mapper 清洗后再转 {@link common.ecommerce.shared.support.Money}。</p>
*
* <p>币种约定:</p>
* <ul>

8
lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package common.ecommerce.lingxing.http;
import common.ecommerce.lingxing.LingxingConstants;
import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.error.RateLimitException;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.error.RateLimitException;
import common.ecommerce.http.HttpResponse;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.Responses;

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

@ -2,9 +2,9 @@ package common.ecommerce.lingxing.http; @@ -2,9 +2,9 @@ package common.ecommerce.lingxing.http;
import common.ecommerce.http.HttpRequest;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;

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

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.lingxing.http;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.shared.spi.ChannelSecret;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;

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

@ -5,11 +5,11 @@ import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto; @@ -5,11 +5,11 @@ import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto;
import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.channel.model.order.OrderLine;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.ZoneId;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleQuery;
import common.ecommerce.shared.support.Page;
/**
* 子平台的售后能力(只读)。

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

@ -7,9 +7,9 @@ import common.ecommerce.lingxing.LingxingApi; @@ -7,9 +7,9 @@ import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.http.LingxingRateLimiter;
import common.ecommerce.lingxing.http.LingxingRequestFactory;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import java.util.Map;

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;

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.order.SalesOrder;
import common.ecommerce.channel.model.order.SalesOrderQuery;
import common.ecommerce.shared.support.Page;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.multiplatform.order.LingxingOrderFilters;
@ -31,7 +31,7 @@ public interface LingxingOrderSource { @@ -31,7 +31,7 @@ public interface LingxingOrderSource {
/** 单订单详情;没有详情接口的实现直接抛出即可。 */
default SalesOrder order(LingxingCall call, String channelOrderId) {
throw new common.ecommerce.error.ChannelException.UnsupportedCapabilityException(
common.ecommerce.model.Capability.SALES_ORDER);
throw new common.ecommerce.shared.error.ChannelException.UnsupportedCapabilityException(
common.ecommerce.shared.model.Capability.SALES_ORDER);
}
}

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

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.fulfillment.OutboundOrder;
import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.shared.support.Page;
/**
* 子平台 / 账户的销售出库单能力。

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;

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.shared.support.Page;
/**
* 子平台的商品 / Listing 能力。

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

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.settlement.SettlementQuery;
import common.ecommerce.channel.model.settlement.SettlementTransaction;
import common.ecommerce.shared.support.Page;
/**
* 子平台的结算 / 账单能力。

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;

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

@ -17,7 +17,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource; @@ -17,7 +17,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
public interface LingxingSubPlatform {
/** 对应的业务平台,用于注册表与日志。 */
common.ecommerce.model.Platform platform();
common.ecommerce.shared.model.Platform platform();
/** 订单能力(领星标准订单接口);不支持时为 null。 */
default LingxingOrderSource orderSource() {

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

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.lingxing.platform;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Platform;
import java.util.Collections;
import java.util.EnumMap;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/aeph/AephSubPlatform.java

@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource; @@ -7,7 +7,7 @@ import common.ecommerce.lingxing.platform.LingxingShopSource;
import common.ecommerce.lingxing.platform.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrderSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Platform;
/**
* 领星 · AEPH 子平台:只做能力组合。

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

@ -7,10 +7,10 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; @@ -7,10 +7,10 @@ import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingAfterSaleSource;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.aftersale.AfterSaleType;
import common.ecommerce.model.support.Page;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleQuery;
import common.ecommerce.channel.model.aftersale.AfterSaleType;
import common.ecommerce.shared.support.Page;
import java.time.ZoneId;
import java.util.ArrayList;

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

@ -2,12 +2,12 @@ package common.ecommerce.lingxing.platform.aftersale; @@ -2,12 +2,12 @@ package common.ecommerce.lingxing.platform.aftersale;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleDto;
import common.ecommerce.lingxing.platform.aftersale.dto.AfterSaleItemDto;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleType;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.channel.model.aftersale.AfterSale;
import common.ecommerce.channel.model.aftersale.AfterSaleType;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.math.BigDecimal;
import java.time.Instant;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/aliexpress/AliexpressSubPlatform.java

@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrder @@ -11,7 +11,7 @@ import common.ecommerce.lingxing.platform.multiplatform.order.MultiPlatformOrder
import common.ecommerce.lingxing.platform.multiplatform.outbound.MultiPlatformOutboundSource;
import common.ecommerce.lingxing.platform.multiplatform.shop.MultiPlatformShopSource;
import common.ecommerce.lingxing.platform.LingxingOutboundSource;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Platform;
/**
* 领星 · AliExpress 子平台:只做能力组合。

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

@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse; @@ -5,20 +5,20 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.ValidationException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.ValidationException;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchBody;
import common.ecommerce.lingxing.platform.multiplatform.product.LingxingProductSearchMapper;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.lingxing.platform.aliexpress.dto.AliexpressListingDto;
import common.ecommerce.lingxing.platform.LingxingProductSource;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductStatus;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.channel.model.product.ProductListing;
import common.ecommerce.channel.model.product.ProductQuery;
import common.ecommerce.channel.model.product.ProductStatus;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.LocalDateTime;

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

Loading…
Cancel
Save