Browse Source

refactor: 拆出 common 模块,渠道域与仓库域共享基础设施

把与渠道域无关的基础设施从 core 上提到 common 模块(包名
common.ecommerce.shared.*),为三方仓域复用同一套 SPI 与管道做准备。
不改变任何行为,只做搬迁、改包名与 import。

迁移内容(36 个类 + 3 个测试):
- audit      CallObserver / CallOutcome / CallRecord / Slf4jCallObserver
- error      8 个异常(AuthException … ValidationException)
- idempotency IdempotencyGuard / WriteAudit / WriteResult / WriteScope
- spi        AccessToken / ChannelSecret / TokenStore / LockProvider /
             SecretProvider / SyncCursorStore / Idempotency* 共 10 个
- sync       SyncSpec / SyncResult(SyncEngine 留在 core,它依赖订单模型)
- model      Platform / ChannelProvider / Capability / FulfillmentMode
- support    Money / Page / PlatformTime / CanonicalKeys

模块依赖调整为:
  core / http / testkit → common
  lingxing              → core + http + common
http 不再依赖 core,仓库域可直接复用传输层与令牌管理。

验证:全量 84 个测试通过(common 33 / core 29 / http 13 / testkit 29 /
lingxing 84 含 13 个默认跳过的探针)。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 2 weeks ago
parent
commit
aaeb0c23f5
  1. 4
      GUIDE.md
  2. 14
      README.md
  3. 30
      common/pom.xml
  4. 2
      common/src/main/java/common/ecommerce/shared/audit/CallObserver.java
  5. 2
      common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java
  6. 8
      common/src/main/java/common/ecommerce/shared/audit/CallRecord.java
  7. 2
      common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java
  8. 2
      common/src/main/java/common/ecommerce/shared/error/AuthException.java
  9. 8
      common/src/main/java/common/ecommerce/shared/error/ChannelException.java
  10. 2
      common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java
  11. 2
      common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java
  12. 2
      common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java
  13. 2
      common/src/main/java/common/ecommerce/shared/error/RateLimitException.java
  14. 2
      common/src/main/java/common/ecommerce/shared/error/TransientException.java
  15. 2
      common/src/main/java/common/ecommerce/shared/error/ValidationException.java
  16. 20
      common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java
  17. 8
      common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
  18. 2
      common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
  19. 8
      common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
  20. 2
      common/src/main/java/common/ecommerce/shared/model/Capability.java
  21. 2
      common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
  22. 2
      common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
  23. 2
      common/src/main/java/common/ecommerce/shared/model/Platform.java
  24. 2
      common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
  25. 2
      common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
  26. 2
      common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
  27. 4
      common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
  28. 2
      common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
  29. 4
      common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
  30. 2
      common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
  31. 2
      common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
  32. 4
      common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
  33. 2
      common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
  34. 6
      common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
  35. 2
      common/src/main/java/common/ecommerce/shared/support/Money.java
  36. 2
      common/src/main/java/common/ecommerce/shared/support/Page.java
  37. 2
      common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
  38. 2
      common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
  39. 4
      common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
  40. 10
      common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
  41. 28
      common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
  42. 6
      common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
  43. 6
      core/pom.xml
  44. 2
      core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java
  45. 6
      core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java
  46. 8
      core/src/main/java/common/ecommerce/capability/AfterSales.java
  47. 4
      core/src/main/java/common/ecommerce/capability/AggregatorCapable.java
  48. 2
      core/src/main/java/common/ecommerce/capability/CapabilityReport.java
  49. 2
      core/src/main/java/common/ecommerce/capability/OrderEditCapable.java
  50. 2
      core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java
  51. 10
      core/src/main/java/common/ecommerce/capability/Outbounds.java
  52. 6
      core/src/main/java/common/ecommerce/capability/PlatformAdapter.java
  53. 4
      core/src/main/java/common/ecommerce/capability/ProductCapable.java
  54. 8
      core/src/main/java/common/ecommerce/capability/Products.java
  55. 6
      core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java
  56. 10
      core/src/main/java/common/ecommerce/capability/SalesOrders.java
  57. 2
      core/src/main/java/common/ecommerce/capability/SettlementCapable.java
  58. 8
      core/src/main/java/common/ecommerce/capability/Settlements.java
  59. 6
      core/src/main/java/common/ecommerce/model/account/AccountKey.java
  60. 4
      core/src/main/java/common/ecommerce/model/account/ChannelAccount.java
  61. 8
      core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java
  62. 6
      core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java
  63. 2
      core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrderLine.java
  64. 2
      core/src/main/java/common/ecommerce/model/fulfillment/ShippingLabel.java
  65. 2
      core/src/main/java/common/ecommerce/model/order/OrderLine.java
  66. 6
      core/src/main/java/common/ecommerce/model/order/SalesOrder.java
  67. 8
      core/src/main/java/common/ecommerce/model/product/ProductListing.java
  68. 6
      core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java
  69. 4
      core/src/main/java/common/ecommerce/sdk/AdapterFactory.java
  70. 6
      core/src/main/java/common/ecommerce/sdk/CallSupport.java
  71. 2
      core/src/main/java/common/ecommerce/sdk/ChannelConnection.java
  72. 6
      core/src/main/java/common/ecommerce/sdk/ChannelContext.java
  73. 14
      core/src/main/java/common/ecommerce/sdk/ChannelSdk.java
  74. 2
      core/src/main/java/common/ecommerce/spi/Sink.java
  75. 6
      core/src/main/java/common/ecommerce/sync/SyncEngine.java
  76. 16
      core/src/test/java/common/ecommerce/capability/PartialFailureAuditTest.java
  77. 16
      core/src/test/java/common/ecommerce/sdk/CallObserverTest.java
  78. 54
      core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java
  79. 18
      core/src/test/java/common/ecommerce/sdk/RequestIdAndCoverageTest.java
  80. 2
      http/pom.xml
  81. 4
      http/src/main/java/common/ecommerce/http/OkHttpTransport.java
  82. 10
      http/src/main/java/common/ecommerce/http/Responses.java
  83. 2
      http/src/main/java/common/ecommerce/http/Signer.java
  84. 14
      http/src/main/java/common/ecommerce/http/TokenManager.java
  85. 12
      http/src/test/java/common/ecommerce/http/ResponsesTest.java
  86. 12
      http/src/test/java/common/ecommerce/http/TokenManagerTest.java
  87. 4
      lingxing/pom.xml
  88. 2
      lingxing/src/main/java/common/ecommerce/lingxing/LingxingConstants.java
  89. 20
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java
  90. 8
      lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java
  91. 6
      lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java
  92. 2
      lingxing/src/main/java/common/ecommerce/lingxing/dto/LingxingTransactionInfoDto.java
  93. 8
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java
  94. 4
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java
  95. 2
      lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java
  96. 6
      lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java
  97. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingAfterSaleSource.java
  98. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingCall.java
  99. 6
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOrderSource.java
  100. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingOutboundOrderSource.java
  101. Some files were not shown because too many files have changed in this diff Show More

4
GUIDE.md

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

14
README.md

@ -18,11 +18,21 @@ @@ -18,11 +18,21 @@
| 模块 | 职责 |
|:---|:---|
| `common-ecommerce-core` | 领域模型、能力接口、门面、管道、SPI。**零第三方运行时依赖** |
| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码 |
| `common-ecommerce-common` | **跨域共享层**:异常体系、SPI 契约、幂等、审计、水位线、通用值对象(Money / Page / PlatformTime / 枚举)。不依赖任何领域模块 |
| `common-ecommerce-core` | 渠道域:领域模型、能力接口、门面、同步管道。依赖 `common` |
| `common-ecommerce-http` | HTTP 传输、签名、令牌管理、JSON 编解码。依赖 `common`,**不依赖 `core`** |
| `common-ecommerce-testkit` | InMemory SPI 与测试替身 |
| `common-ecommerce-lingxing` | 领星聚合适配器(多子平台)。DTO 用 Lombok 生成访问器 |
依赖方向:
```
core ─┐
http ─┼──→ common
testkit ─┘
lingxing ──→ core, http, common
```
渠道域与未来的仓库域平级,互不依赖,只共享 `common`。`http` 不依赖 `core`,仓库域可以直接复用传输层与令牌管理。
**Lombok 使用范围**:仅 `lingxing` 模块的 `dto/*`,`scope=provided`,不进宿主运行时。
`core` 的领域模型是**不可变 + Builder**,不使用 Lombok——省下的行数有限,
而 `core` 要尽量少依赖编译期工具。

30
common/pom.xml

@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
<?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-common</artifactId>
<description>
跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。
不依赖任何领域模块,供渠道域(core)与仓库域复用。
</description>
<dependencies>
<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>

2
core/src/main/java/common/ecommerce/audit/CallObserver.java → common/src/main/java/common/ecommerce/shared/audit/CallObserver.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.audit;
package common.ecommerce.shared.audit;
/**
* SDK 调用观察者:操作日志 / 审计日志的宿主扩展点。

2
core/src/main/java/common/ecommerce/audit/CallOutcome.java → common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.audit;
package common.ecommerce.shared.audit;
/**
* 一次 SDK 调用的结果状态。

8
core/src/main/java/common/ecommerce/audit/CallRecord.java → common/src/main/java/common/ecommerce/shared/audit/CallRecord.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.audit;
package common.ecommerce.shared.audit;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.time.Instant;
import java.time.ZoneId;

2
core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java → common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.audit;
package common.ecommerce.shared.audit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/common/ecommerce/error/AuthException.java → common/src/main/java/common/ecommerce/shared/error/AuthException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 认证失败:401/403、token 失效。刷新后重试一次;仍失败则告警并停用账户。

8
core/src/main/java/common/ecommerce/error/ChannelException.java → common/src/main/java/common/ecommerce/shared/error/ChannelException.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
import common.ecommerce.model.Capability;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.Platform;
/**
* 统一异常基类。适配器把平台错误映射到这里;{@code rawResponse} 必须已脱敏。
@ -18,7 +18,7 @@ public class ChannelException extends RuntimeException { @@ -18,7 +18,7 @@ public class ChannelException extends RuntimeException {
/** 业务平台;未知时为 null。 */
private final Platform platform;
/** 接入通道名({@link common.ecommerce.model.ChannelProvider} 的 name);未知时为 null。 */
/** 接入通道名({@link common.ecommerce.shared.model.ChannelProvider} 的 name);未知时为 null。 */
private final String provider;
/** 宿主侧店铺 ID;未知时为 null。 */
private final String omsStoreId;

2
core/src/main/java/common/ecommerce/error/CrossProviderConflictException.java → common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 跨 provider 冲突:同一业务动作已由另一个 provider 完成。

2
core/src/main/java/common/ecommerce/error/IdempotencyConflictException.java → common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 写操作幂等冲突:重复写。返回已完成结果,不视为失败。

2
core/src/main/java/common/ecommerce/error/PlatformBusinessException.java → common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 平台业务错误码。是否重试视错误码而定,保留 code/message/raw。

2
core/src/main/java/common/ecommerce/error/RateLimitException.java → common/src/main/java/common/ecommerce/shared/error/RateLimitException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 限流:429。遵守 Retry-After 并退避。

2
core/src/main/java/common/ecommerce/error/TransientException.java → common/src/main/java/common/ecommerce/shared/error/TransientException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 瞬时错误:5xx / 网络 / 超时。退避加抖动后重试,超过上限进入补偿队列。

2
core/src/main/java/common/ecommerce/error/ValidationException.java → common/src/main/java/common/ecommerce/shared/error/ValidationException.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.error;
package common.ecommerce.shared.error;
/**
* 参数或映射错误:4xx。不重试,保留原始报文由人工修正映射。

20
core/src/main/java/common/ecommerce/idempotency/IdempotencyGuard.java → common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java

@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
package common.ecommerce.idempotency;
package common.ecommerce.shared.idempotency;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.CrossProviderConflictException;
import common.ecommerce.error.IdempotencyConflictException;
import common.ecommerce.spi.IdempotencyClaim;
import common.ecommerce.spi.IdempotencyRecord;
import common.ecommerce.spi.IdempotencyStatus;
import common.ecommerce.spi.IdempotencyStore;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.CrossProviderConflictException;
import common.ecommerce.shared.error.IdempotencyConflictException;
import common.ecommerce.shared.spi.IdempotencyClaim;
import common.ecommerce.shared.spi.IdempotencyRecord;
import common.ecommerce.shared.spi.IdempotencyStatus;
import common.ecommerce.shared.spi.IdempotencyStore;
import java.time.Clock;
import java.time.Instant;

8
core/src/main/java/common/ecommerce/idempotency/WriteAudit.java → common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java

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

2
core/src/main/java/common/ecommerce/idempotency/WriteResult.java → common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.idempotency;
package common.ecommerce.shared.idempotency;
/**
* 写操作执行结果。

8
core/src/main/java/common/ecommerce/idempotency/WriteScope.java → common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java

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

2
core/src/main/java/common/ecommerce/model/Capability.java → common/src/main/java/common/ecommerce/shared/model/Capability.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model;
package common.ecommerce.shared.model;
/**
* 能力枚举。

2
core/src/main/java/common/ecommerce/model/ChannelProvider.java → common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model;
package common.ecommerce.shared.model;
/**
* 接入 provider 枚举。

2
core/src/main/java/common/ecommerce/model/FulfillmentMode.java → common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model;
package common.ecommerce.shared.model;
/** 履约模式,对应四种业务模式中的 A / C / D;B(FBA/WFS 平台仓发货)只读,不在枚举内。 */
public enum FulfillmentMode {

2
core/src/main/java/common/ecommerce/model/Platform.java → common/src/main/java/common/ecommerce/shared/model/Platform.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model;
package common.ecommerce.shared.model;
/**
* 业务平台枚举。

2
core/src/main/java/common/ecommerce/spi/AccessToken.java → common/src/main/java/common/ecommerce/shared/spi/AccessToken.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import java.time.Instant;
import java.util.Objects;

2
core/src/main/java/common/ecommerce/spi/ChannelSecret.java → common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import java.util.Objects;

2
core/src/main/java/common/ecommerce/spi/IdempotencyClaim.java → common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
/**
* 抢占幂等键的结果。

4
core/src/main/java/common/ecommerce/spi/IdempotencyRecord.java → common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;
import java.util.Objects;

2
core/src/main/java/common/ecommerce/spi/IdempotencyStatus.java → common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
/**
* 幂等键状态。

4
core/src/main/java/common/ecommerce/spi/IdempotencyStore.java → common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;
import java.util.Optional;

2
core/src/main/java/common/ecommerce/spi/LockProvider.java → common/src/main/java/common/ecommerce/shared/spi/LockProvider.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import java.util.Optional;

2
core/src/main/java/common/ecommerce/spi/SecretProvider.java → common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
/**
* 凭证读取 SPI。{@code credentialRef} 由 {@code ChannelAccount} 提供。

4
core/src/main/java/common/ecommerce/spi/SyncCursorStore.java → common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.shared.model.ChannelProvider;
import java.time.Instant;

2
core/src/main/java/common/ecommerce/spi/TokenStore.java → common/src/main/java/common/ecommerce/shared/spi/TokenStore.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.spi;
package common.ecommerce.shared.spi;
import java.util.Optional;

6
core/src/main/java/common/ecommerce/model/support/CanonicalKeys.java → common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.model.support;
package common.ecommerce.shared.support;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;

2
core/src/main/java/common/ecommerce/model/support/Money.java → common/src/main/java/common/ecommerce/shared/support/Money.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.support;
package common.ecommerce.shared.support;
import java.math.BigDecimal;
import java.math.RoundingMode;

2
core/src/main/java/common/ecommerce/model/support/Page.java → common/src/main/java/common/ecommerce/shared/support/Page.java

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

2
core/src/main/java/common/ecommerce/model/support/PlatformTime.java → common/src/main/java/common/ecommerce/shared/support/PlatformTime.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.model.support;
package common.ecommerce.shared.support;
import java.time.Clock;
import java.time.Instant;

2
core/src/main/java/common/ecommerce/sync/SyncResult.java → common/src/main/java/common/ecommerce/shared/sync/SyncResult.java

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
package common.ecommerce.sync;
package common.ecommerce.shared.sync;
/**
* 单次同步结果。

4
core/src/main/java/common/ecommerce/sync/SyncSpec.java → common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.sync;
package common.ecommerce.shared.sync;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.shared.model.ChannelProvider;
import java.time.Duration;
import java.time.Instant;

10
core/src/test/java/common/ecommerce/audit/Slf4jCallObserverTest.java → common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.audit;
package common.ecommerce.shared.audit;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import org.junit.jupiter.api.Test;
import java.time.Instant;

28
core/src/test/java/common/ecommerce/idempotency/WriteAuditTest.java → common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java

@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
package common.ecommerce.idempotency;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.CallOutcome;
import common.ecommerce.audit.CallRecord;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.CrossProviderConflictException;
import common.ecommerce.error.IdempotencyConflictException;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.spi.IdempotencyClaim;
import common.ecommerce.spi.IdempotencyRecord;
import common.ecommerce.spi.IdempotencyStatus;
import common.ecommerce.spi.IdempotencyStore;
package common.ecommerce.shared.idempotency;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.CrossProviderConflictException;
import common.ecommerce.shared.error.IdempotencyConflictException;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.spi.IdempotencyClaim;
import common.ecommerce.shared.spi.IdempotencyRecord;
import common.ecommerce.shared.spi.IdempotencyStatus;
import common.ecommerce.shared.spi.IdempotencyStore;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

6
core/src/test/java/common/ecommerce/model/support/CanonicalKeysTest.java → common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.model.support;
package common.ecommerce.shared.support;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import org.junit.jupiter.api.Test;

6
core/pom.xml

@ -11,10 +11,14 @@ @@ -11,10 +11,14 @@
</parent>
<artifactId>common-ecommerce-core</artifactId>
<description>领域模型、能力接口、门面、管道、SPI(无平台代码、无第三方运行时依赖)</description>
<description>渠道域:领域模型、能力接口、门面、同步管道(无平台代码)</description>
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

2
core/src/main/java/common/ecommerce/capability/AdapterCapabilityReport.java

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

6
core/src/main/java/common/ecommerce/capability/AfterSaleCapable.java

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
package common.ecommerce.capability;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**

8
core/src/main/java/common/ecommerce/capability/AfterSales.java

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.aftersale.AfterSale;
import common.ecommerce.model.aftersale.AfterSaleQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;

4
core/src/main/java/common/ecommerce/capability/AggregatorCapable.java

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
package common.ecommerce.capability;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.sdk.ChannelContext;
import java.util.List;

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

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

2
core/src/main/java/common/ecommerce/capability/OrderEditCapable.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.capability;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.sdk.ChannelContext;

2
core/src/main/java/common/ecommerce/capability/OutboundOrderCapable.java

@ -2,7 +2,7 @@ package common.ecommerce.capability; @@ -2,7 +2,7 @@ package common.ecommerce.capability;
import common.ecommerce.model.fulfillment.OutboundOrder;
import common.ecommerce.model.fulfillment.OutboundOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**

10
core/src/main/java/common/ecommerce/capability/Outbounds.java

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.LabelQuery;
import common.ecommerce.model.fulfillment.OutboundOrder;
@ -12,7 +12,7 @@ import common.ecommerce.model.fulfillment.OutboundPackage; @@ -12,7 +12,7 @@ import common.ecommerce.model.fulfillment.OutboundPackage;
import common.ecommerce.model.fulfillment.OutboundResult;
import common.ecommerce.model.fulfillment.ShipmentReviewResult;
import common.ecommerce.model.fulfillment.ShippingLabel;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;

6
core/src/main/java/common/ecommerce/capability/PlatformAdapter.java

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

4
core/src/main/java/common/ecommerce/capability/ProductCapable.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.capability;
import common.ecommerce.model.Capability;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;

8
core/src/main/java/common/ecommerce/capability/Products.java

@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.product.ProductRef;

6
core/src/main/java/common/ecommerce/capability/SalesOrderCapable.java

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
package common.ecommerce.capability;
import common.ecommerce.error.ChannelException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.sdk.ChannelContext;
/**

10
core/src/main/java/common/ecommerce/capability/SalesOrders.java

@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.error.PlatformBusinessException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.error.PlatformBusinessException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.fulfillment.OrderEditRequest;
import common.ecommerce.model.fulfillment.OrderEditResult;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.order.SalesOrderRef;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;

2
core/src/main/java/common/ecommerce/capability/SettlementCapable.java

@ -2,7 +2,7 @@ package common.ecommerce.capability; @@ -2,7 +2,7 @@ package common.ecommerce.capability;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
/**

8
core/src/main/java/common/ecommerce/capability/Settlements.java

@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
package common.ecommerce.capability;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.CallSupport;
import common.ecommerce.sdk.ChannelContext;

6
core/src/main/java/common/ecommerce/model/account/AccountKey.java

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

4
core/src/main/java/common/ecommerce/model/account/ChannelAccount.java

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
package common.ecommerce.model.account;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.util.ArrayList;
import java.util.Collections;

8
core/src/main/java/common/ecommerce/model/aftersale/AfterSale.java

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

6
core/src/main/java/common/ecommerce/model/fulfillment/OutboundOrder.java

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

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

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

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

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

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

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

6
core/src/main/java/common/ecommerce/model/order/SalesOrder.java

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

8
core/src/main/java/common/ecommerce/model/product/ProductListing.java

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

6
core/src/main/java/common/ecommerce/model/settlement/SettlementTransaction.java

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

4
core/src/main/java/common/ecommerce/sdk/AdapterFactory.java

@ -2,8 +2,8 @@ package common.ecommerce.sdk; @@ -2,8 +2,8 @@ package common.ecommerce.sdk;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import java.util.EnumSet;

6
core/src/main/java/common/ecommerce/sdk/CallSupport.java

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

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

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

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

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

14
core/src/main/java/common/ecommerce/sdk/ChannelSdk.java

@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
package common.ecommerce.sdk;
import common.ecommerce.model.Platform;
import common.ecommerce.audit.CallObserver;
import common.ecommerce.audit.Slf4jCallObserver;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.capability.AdapterCapabilityReport;
import common.ecommerce.capability.AfterSales;
import common.ecommerce.capability.AggregatorCapable;
import common.ecommerce.error.ChannelException;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.capability.Products;
import common.ecommerce.capability.SalesOrders;
import common.ecommerce.capability.Outbounds;
import common.ecommerce.capability.Settlements;
import common.ecommerce.idempotency.IdempotencyGuard;
import common.ecommerce.shared.idempotency.IdempotencyGuard;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.spi.ChannelAccountRepository;
import common.ecommerce.sdk.AdapterFactory.AdapterConfig;
import common.ecommerce.spi.IdempotencyStore;
import common.ecommerce.shared.spi.IdempotencyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
core/src/main/java/common/ecommerce/spi/Sink.java

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
package common.ecommerce.spi;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.model.product.ProductListing;
import common.ecommerce.model.order.SalesOrder;

6
core/src/main/java/common/ecommerce/sync/SyncEngine.java

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

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

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

16
core/src/test/java/common/ecommerce/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.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.product.ProductQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Instant;

54
core/src/test/java/common/ecommerce/sdk/ChannelSdkTest.java

@ -2,14 +2,14 @@ package common.ecommerce.sdk; @@ -2,14 +2,14 @@ package common.ecommerce.sdk;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.capability.PlatformAdapter;
import common.ecommerce.error.ChannelException;
import common.ecommerce.idempotency.WriteResult;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.shared.idempotency.WriteResult;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.Capability;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.support.Page;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.sdk.ChannelContext;
@ -37,7 +37,7 @@ class ChannelSdkTest { @@ -37,7 +37,7 @@ class ChannelSdkTest {
/** 连接信息由调用方每次传入,测试里固定一份。 */
private static final ChannelConnection CONNECTION = ChannelConnection.of(
"https://api.example.com",
common.ecommerce.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
common.ecommerce.shared.spi.ChannelSecret.builder().appKey("ak").appSecret("sk").build());
/** 假直连适配器:单平台,只有订单能力。 */
static final class FakeDirectAdapter implements common.ecommerce.capability.SalesOrderCapable {
@ -197,42 +197,42 @@ class ChannelSdkTest { @@ -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,

18
core/src/test/java/common/ecommerce/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.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallOutcome;
import common.ecommerce.shared.audit.CallRecord;
import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.capability.CapabilityReport;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.AccountKey;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.shared.support.Page;
import common.ecommerce.shared.spi.ChannelSecret;
import org.junit.jupiter.api.Test;
import java.time.Clock;

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-common</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>();

4
lingxing/pom.xml

@ -16,6 +16,10 @@ @@ -16,6 +16,10 @@
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-common</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-core</artifactId>
</dependency>
<dependency>

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 映射。
*

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

@ -10,8 +10,8 @@ import common.ecommerce.capability.SalesOrderCapable; @@ -10,8 +10,8 @@ import common.ecommerce.capability.SalesOrderCapable;
import common.ecommerce.capability.SettlementCapable;
import common.ecommerce.capability.ShipmentReviewCapable;
import common.ecommerce.capability.ShippingLabelCapable;
import common.ecommerce.error.AuthException;
import common.ecommerce.error.ChannelException;
import common.ecommerce.shared.error.AuthException;
import common.ecommerce.shared.error.ChannelException;
import common.ecommerce.http.HttpTransport;
import common.ecommerce.http.JacksonJsonCodec;
import common.ecommerce.http.TokenManager;
@ -33,9 +33,9 @@ import common.ecommerce.lingxing.platform.wms.OrderEditSource; @@ -33,9 +33,9 @@ import common.ecommerce.lingxing.platform.wms.OrderEditSource;
import common.ecommerce.lingxing.platform.wms.ShipmentReviewSource;
import common.ecommerce.lingxing.platform.wms.WmsLabelSource;
import common.ecommerce.lingxing.platform.wms.WmsOutboundOrderSource;
import common.ecommerce.model.Capability;
import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.Platform;
import common.ecommerce.shared.model.Capability;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.model.account.ChannelAccount;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
@ -57,12 +57,12 @@ import common.ecommerce.model.product.ProductRef; @@ -57,12 +57,12 @@ import common.ecommerce.model.product.ProductRef;
import common.ecommerce.model.product.ProductSyncStrategy;
import common.ecommerce.model.settlement.SettlementQuery;
import common.ecommerce.model.settlement.SettlementTransaction;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.sdk.ChannelContext;
import common.ecommerce.spi.AccessToken;
import common.ecommerce.spi.ChannelSecret;
import common.ecommerce.spi.LockProvider;
import common.ecommerce.spi.TokenStore;
import common.ecommerce.shared.spi.AccessToken;
import common.ecommerce.shared.spi.ChannelSecret;
import common.ecommerce.shared.spi.LockProvider;
import common.ecommerce.shared.spi.TokenStore;
import java.time.Clock;
import java.util.EnumSet;

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

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

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;

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

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

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;

6
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.shared.model.ChannelProvider;
import common.ecommerce.model.order.OrderLine;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.support.Money;
import common.ecommerce.model.support.PlatformTime;
import common.ecommerce.shared.support.Money;
import common.ecommerce.shared.support.PlatformTime;
import java.time.Instant;
import java.time.ZoneId;

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

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

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

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

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

@ -2,7 +2,7 @@ package common.ecommerce.lingxing.platform; @@ -2,7 +2,7 @@ package common.ecommerce.lingxing.platform;
import common.ecommerce.model.order.SalesOrder;
import common.ecommerce.model.order.SalesOrderQuery;
import common.ecommerce.model.support.Page;
import common.ecommerce.shared.support.Page;
import common.ecommerce.lingxing.platform.LingxingCall;
import common.ecommerce.lingxing.platform.multiplatform.order.LingxingOrderFilters;
@ -31,7 +31,7 @@ public interface LingxingOrderSource { @@ -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);
}
}

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

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

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

Loading…
Cancel
Save