diff --git a/GUIDE.md b/GUIDE.md index 99d2853..2a63b9d 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -147,7 +147,7 @@ public interface ProductCapable extends PlatformAdapter { Java 擦除后两个 `get(ctx, String)` 是同一个签名。一个同时实现订单和商品的适配器(比如直连沃尔玛)**无法同时实现**,编译器直接报名称冲突。所以包成两个不同的类。 -> 对应的 import 路径:`common.ecommerce.model.order.SalesOrderRef`、`common.ecommerce.model.product.ProductRef`。`model` 包按职责拆成 `account` / `order` / `product` / `support` 四个子包,枚举留在 `model` 根包。 +> 对应的 import 路径:`common.ecommerce.channel.model.order.SalesOrderRef`、`common.ecommerce.channel.model.product.ProductRef`。`channel.model` 按职责拆成 `account` / `order` / `product` / `fulfillment` / `aftersale` / `settlement` 六个子包;枚举在 `common.ecommerce.shared.model` 根包。 **为什么 `pull` 返回 `Page` 而不是 `List`?** @@ -410,17 +410,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 { diff --git a/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java b/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java index 6ca8875..373de7e 100644 --- a/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.idempotency; +package common.ecommerce.shared.idempotency; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.error.CrossProviderConflictException;