Browse Source

refactor: 按 Spec W0 拆分 sdk-common / channel-sdk-core,http 并入 sdk-common

模块更名与上提(Spec W0 §11):
- shared → sdk-common,http 合并进来,channel-sdk-http 取消
- channel → channel-sdk-core,testkit → sdk-testkit
- 父 POM 更名为 channel-sdk-parent

共享层为跨域复用做的三处调整:
- IdempotencyStore / IdempotencyRecord 的 provider 改为 String,
  渠道域与仓库域两套 provider 枚举落同一张幂等表
- 新增 WriteIdentity,WriteScope 实现它;幂等守卫改为面向接口
- CallSupport 从 channel 移到 sdk-common,新增 CallScope;
  ChannelContext 实现 CallScope,耗时与埋点维度不再绑定渠道域

ChannelProvider 里误加的 YUNQUNA 移除:仓不是渠道,走 WarehouseProvider。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 2 weeks ago
parent
commit
96f6621bbd
  1. 6
      channel-sdk-core/pom.xml
  2. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java
  3. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java
  4. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSales.java
  5. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java
  6. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java
  7. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java
  8. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java
  9. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Inbounds.java
  10. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java
  11. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java
  12. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java
  13. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Outbounds.java
  14. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java
  15. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ProductCapable.java
  16. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Products.java
  17. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java
  18. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrders.java
  19. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java
  20. 2
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Settlements.java
  21. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java
  22. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java
  23. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/AccountKey.java
  24. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java
  25. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java
  26. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java
  27. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java
  28. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java
  29. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java
  30. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java
  31. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java
  32. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java
  33. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java
  34. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java
  35. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java
  36. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java
  37. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java
  38. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java
  39. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java
  40. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java
  41. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java
  42. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java
  43. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java
  44. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java
  45. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java
  46. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/OrderLine.java
  47. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java
  48. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java
  49. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java
  50. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductListing.java
  51. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java
  52. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductRef.java
  53. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java
  54. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java
  55. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java
  56. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java
  57. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java
  58. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java
  59. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java
  60. 24
      channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java
  61. 1
      channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java
  62. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java
  63. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java
  64. 0
      channel-sdk-core/src/main/java/common/ecommerce/channel/spi/Sink.java
  65. 4
      channel-sdk-core/src/main/java/common/ecommerce/channel/sync/SyncEngine.java
  66. 0
      channel-sdk-core/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java
  67. 2
      channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java
  68. 2
      channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java
  69. 2
      channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java
  70. 48
      http/pom.xml
  71. 12
      lingxing/pom.xml
  72. 2
      lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java
  73. 30
      pom.xml
  74. 12
      sdk-common/pom.xml
  75. 0
      sdk-common/src/main/java/common/ecommerce/http/HttpRequest.java
  76. 0
      sdk-common/src/main/java/common/ecommerce/http/HttpResponse.java
  77. 0
      sdk-common/src/main/java/common/ecommerce/http/HttpTransport.java
  78. 0
      sdk-common/src/main/java/common/ecommerce/http/JacksonJsonCodec.java
  79. 0
      sdk-common/src/main/java/common/ecommerce/http/JsonCodec.java
  80. 0
      sdk-common/src/main/java/common/ecommerce/http/OkHttpTransport.java
  81. 0
      sdk-common/src/main/java/common/ecommerce/http/Responses.java
  82. 0
      sdk-common/src/main/java/common/ecommerce/http/TokenManager.java
  83. 0
      sdk-common/src/main/java/common/ecommerce/shared/audit/CallObserver.java
  84. 0
      sdk-common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java
  85. 21
      sdk-common/src/main/java/common/ecommerce/shared/audit/CallRecord.java
  86. 29
      sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java
  87. 103
      sdk-common/src/main/java/common/ecommerce/shared/audit/CallSupport.java
  88. 0
      sdk-common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java
  89. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/AuthException.java
  90. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/ChannelException.java
  91. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java
  92. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java
  93. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java
  94. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/RateLimitException.java
  95. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/TransientException.java
  96. 0
      sdk-common/src/main/java/common/ecommerce/shared/error/ValidationException.java
  97. 47
      sdk-common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java
  98. 25
      sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
  99. 36
      sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java
  100. 0
      sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
  101. Some files were not shown because too many files have changed in this diff Show More

6
channel/pom.xml → channel-sdk-core/pom.xml

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

0
channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java

0
channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java

2
channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSales.java

@ -7,7 +7,7 @@ import common.ecommerce.channel.model.account.ChannelAccount; @@ -7,7 +7,7 @@ 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.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/**

0
channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java

0
channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java

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

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

2
channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Inbounds.java

@ -5,7 +5,7 @@ import common.ecommerce.channel.model.inbound.InboundReceipt; @@ -5,7 +5,7 @@ import common.ecommerce.channel.model.inbound.InboundReceipt;
import common.ecommerce.channel.model.inbound.InboundReceiptQuery;
import common.ecommerce.channel.model.inbound.InboundShipment;
import common.ecommerce.channel.model.inbound.InboundShipmentQuery;
import common.ecommerce.channel.sdk.CallSupport;
import common.ecommerce.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.error.ChannelException;

0
channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java

0
channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java

0
channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java

2
channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Outbounds.java

@ -13,7 +13,7 @@ import common.ecommerce.channel.model.fulfillment.OutboundResult; @@ -13,7 +13,7 @@ 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.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

0
channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java

0
channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ProductCapable.java

2
channel/src/main/java/common/ecommerce/channel/capability/Products.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Products.java

@ -8,7 +8,7 @@ import common.ecommerce.shared.support.Page; @@ -8,7 +8,7 @@ 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.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/** 门面持有的商品视图。 */

0
channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java

2
channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrders.java

@ -11,7 +11,7 @@ import common.ecommerce.channel.model.order.SalesOrder; @@ -11,7 +11,7 @@ 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.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
import java.util.List;

0
channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java

2
channel/src/main/java/common/ecommerce/channel/capability/Settlements.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Settlements.java

@ -7,7 +7,7 @@ import common.ecommerce.channel.model.account.ChannelAccount; @@ -7,7 +7,7 @@ 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.shared.audit.CallSupport;
import common.ecommerce.channel.sdk.ChannelContext;
/**

0
channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java

0
channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java → channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java

0
channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/AccountKey.java

0
channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java

0
channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java

0
channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java

0
channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java

0
channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java

0
channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/OrderLine.java

0
channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java

0
channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductListing.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductRef.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java

0
channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java

0
channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java

0
channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java → channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java

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

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

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

@ -3,6 +3,7 @@ package common.ecommerce.channel.sdk; @@ -3,6 +3,7 @@ package common.ecommerce.channel.sdk;
import common.ecommerce.channel.model.account.AccountKey;
import common.ecommerce.channel.model.account.ChannelAccount;
import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.audit.CallScope;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.spi.ChannelSecret;
@ -14,7 +15,7 @@ import java.util.Objects; @@ -14,7 +15,7 @@ import java.util.Objects;
*
* <p>连接信息(端点、凭据)由<b>调用方在每次请求时传入</b>,见 {@link ChannelConnection}。</p>
*/
public final class ChannelContext {
public final class ChannelContext implements CallScope {
/** 账户标识;构造时若未显式传入则取自账户。 */
private final AccountKey key;
@ -95,6 +96,7 @@ public final class ChannelContext { @@ -95,6 +96,7 @@ public final class ChannelContext {
}
/** OMS 店铺 ID(业务归属),即使账户没查到也有值。 */
@Override
public String omsStoreId() {
return key.omsStoreId();
}
@ -131,11 +133,31 @@ public final class ChannelContext { @@ -131,11 +133,31 @@ public final class ChannelContext {
}
/** 链路 ID,用于日志与原始报文关联;每次门面调用一个,可用 {@link #withRequestId(String)} 替换。 */
@Override
public String requestId() {
return requestId;
}
/** 接入通道名,实现 {@link CallScope}。 */
@Override
public String providerName() {
return key.provider().name();
}
/** 业务平台名,实现 {@link CallScope}。 */
@Override
public String platformName() {
return key.platform().name();
}
/** 渠道侧店铺 ID;无账户时为 null。 */
@Override
public String externalStoreId() {
return account == null ? null : account.externalStoreId();
}
/** UTC 时钟;测试可注入固定时间。 */
@Override
public Clock clock() {
return clock;
}

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

@ -2,6 +2,7 @@ package common.ecommerce.channel.sdk; @@ -2,6 +2,7 @@ package common.ecommerce.channel.sdk;
import common.ecommerce.shared.model.Platform;
import common.ecommerce.shared.audit.CallObserver;
import common.ecommerce.shared.audit.CallSupport;
import common.ecommerce.shared.audit.Slf4jCallObserver;
import common.ecommerce.channel.capability.AdapterCapabilityReport;
import common.ecommerce.channel.capability.AfterSales;

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

0
channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java → channel-sdk-core/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java

0
channel/src/main/java/common/ecommerce/channel/spi/Sink.java → channel-sdk-core/src/main/java/common/ecommerce/channel/spi/Sink.java

4
channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java → channel-sdk-core/src/main/java/common/ecommerce/channel/sync/SyncEngine.java

@ -60,7 +60,7 @@ public final class SyncEngine { @@ -60,7 +60,7 @@ public final class SyncEngine {
*/
public SyncResult syncSalesOrders(SyncSpec spec, Instant to,
BiFunction<Instant, String, Page<SalesOrder>> fetch) {
Instant watermark = cursorStore.get(spec.provider(), spec.accountKey(), spec.stream());
Instant watermark = cursorStore.get(spec.provider().name(), spec.accountKey(), spec.stream());
Instant from = spec.from(watermark);
if (from == null) {
throw new IllegalStateException("no watermark for " + spec.accountKey()
@ -85,7 +85,7 @@ public final class SyncEngine { @@ -85,7 +85,7 @@ public final class SyncEngine {
}
}
cursorStore.advance(spec.provider(), spec.accountKey(), spec.stream(), to);
cursorStore.advance(spec.provider().name(), spec.accountKey(), spec.stream(), to);
LOG.debug("sync {} pages={} items={} from={} to={}", spec.stream(), pages, items, from, to);
return SyncResult.of(pages, items, true);
}

0
channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java → channel-sdk-core/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java

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

@ -90,7 +90,7 @@ class CallObserverTest { @@ -90,7 +90,7 @@ class CallObserverTest {
CallRecord record = observer.records.get(0);
assertEquals("salesOrders.pull", record.operation());
assertEquals(CallOutcome.SUCCESS, record.outcome());
assertEquals(ChannelProvider.DIRECT, record.provider());
assertEquals(ChannelProvider.DIRECT.name(), record.provider());
assertEquals(Platform.WALMART_SC, record.platform());
assertEquals("oms-wm-001", record.omsStoreId());
assertEquals("wm-seller-01", record.externalStoreId());

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

@ -204,7 +204,7 @@ class ChannelSdkTest { @@ -204,7 +204,7 @@ class ChannelSdkTest {
@Override
public common.ecommerce.shared.spi.IdempotencyClaim claim(String key, String owner,
ChannelProvider provider, java.time.Instant now, long ttlSeconds) {
String provider, java.time.Instant now, long ttlSeconds) {
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(

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

@ -180,7 +180,7 @@ class RequestIdAndCoverageTest { @@ -180,7 +180,7 @@ class RequestIdAndCoverageTest {
CallRecord record = observer.records.get(0);
assertEquals("capabilities", record.operation());
assertEquals(CallOutcome.SUCCESS, record.outcome());
assertEquals(ChannelProvider.DIRECT, record.provider());
assertEquals(ChannelProvider.DIRECT.name(), record.provider());
assertEquals(Platform.WALMART_SC, record.platform());
assertEquals("oms-wm-001", record.omsStoreId());
assertEquals("wm-seller-01", record.externalStoreId());

48
http/pom.xml

@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
<?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-http</artifactId>
<description>HTTP 传输、签名、令牌管理、JSON 编解码</description>
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-shared</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</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>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

12
lingxing/pom.xml

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<parent>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce</artifactId>
<artifactId>channel-sdk-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@ -16,15 +16,11 @@ @@ -16,15 +16,11 @@
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-shared</artifactId>
<artifactId>sdk-common</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-channel</artifactId>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-http</artifactId>
<artifactId>channel-sdk-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@ -42,7 +38,7 @@ @@ -42,7 +38,7 @@
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-testkit</artifactId>
<artifactId>sdk-testkit</artifactId>
<scope>test</scope>
</dependency>
<dependency>

2
lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java

@ -127,7 +127,7 @@ class LingxingCallObserverTest { @@ -127,7 +127,7 @@ class LingxingCallObserverTest {
CallRecord record = observer.records.get(0);
assertEquals("salesOrders.pull", record.operation());
assertEquals(CallOutcome.SUCCESS, record.outcome());
assertEquals(ChannelProvider.LINGXING, record.provider());
assertEquals(ChannelProvider.LINGXING.name(), record.provider());
assertEquals(Platform.WALMART_SC, record.platform());
assertEquals(account.omsStoreId(), record.omsStoreId());
assertEquals("store-1", record.externalStoreId());

30
pom.xml

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce</artifactId>
<artifactId>channel-sdk-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>common-ecommerce</name>
@ -26,33 +26,45 @@ @@ -26,33 +26,45 @@
</properties>
<modules>
<module>shared</module>
<module>channel</module>
<module>http</module>
<module>testkit</module>
<module>sdk-common</module>
<module>channel-sdk-core</module>
<module>sdk-testkit</module>
<module>lingxing</module>
<module>warehouse-sdk-core</module>
<module>warehouse-sdk-testkit</module>
<module>warehouse-sdk-yqn</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-shared</artifactId>
<artifactId>sdk-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-channel</artifactId>
<artifactId>channel-sdk-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-http</artifactId>
<artifactId>sdk-testkit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce-testkit</artifactId>
<artifactId>warehouse-sdk-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>warehouse-sdk-testkit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ecommerce</groupId>
<artifactId>warehouse-sdk-yqn</artifactId>
<version>${project.version}</version>
</dependency>

12
shared/pom.xml → sdk-common/pom.xml

@ -6,11 +6,11 @@ @@ -6,11 +6,11 @@
<parent>
<groupId>ecommerce</groupId>
<artifactId>common-ecommerce</artifactId>
<artifactId>channel-sdk-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-ecommerce-shared</artifactId>
<artifactId>sdk-common</artifactId>
<description>
跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。
不依赖任何领域模块,供渠道域(core)与仓库域复用。
@ -18,6 +18,14 @@ @@ -18,6 +18,14 @@
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

0
http/src/main/java/common/ecommerce/http/HttpRequest.java → sdk-common/src/main/java/common/ecommerce/http/HttpRequest.java

0
http/src/main/java/common/ecommerce/http/HttpResponse.java → sdk-common/src/main/java/common/ecommerce/http/HttpResponse.java

0
http/src/main/java/common/ecommerce/http/HttpTransport.java → sdk-common/src/main/java/common/ecommerce/http/HttpTransport.java

0
http/src/main/java/common/ecommerce/http/JacksonJsonCodec.java → sdk-common/src/main/java/common/ecommerce/http/JacksonJsonCodec.java

0
http/src/main/java/common/ecommerce/http/JsonCodec.java → sdk-common/src/main/java/common/ecommerce/http/JsonCodec.java

0
http/src/main/java/common/ecommerce/http/OkHttpTransport.java → sdk-common/src/main/java/common/ecommerce/http/OkHttpTransport.java

0
http/src/main/java/common/ecommerce/http/Responses.java → sdk-common/src/main/java/common/ecommerce/http/Responses.java

0
http/src/main/java/common/ecommerce/http/TokenManager.java → sdk-common/src/main/java/common/ecommerce/http/TokenManager.java

0
shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java → sdk-common/src/main/java/common/ecommerce/shared/audit/CallObserver.java

0
shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java → sdk-common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java

21
shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java → sdk-common/src/main/java/common/ecommerce/shared/audit/CallRecord.java

@ -27,8 +27,8 @@ public final class CallRecord { @@ -27,8 +27,8 @@ public final class CallRecord {
private final Instant occurredAt;
/** <b>我方</b>链路 ID(可注入 traceId),可能为 null;不是平台工单号。 */
private final String requestId;
/** 接入通道;账户/适配器还没解析出来时可能为 null。 */
private final ChannelProvider provider;
/** 接入通道名({@code ChannelProvider} / {@code WarehouseProvider} 的 name);账户/适配器还没解析出来时可能为 null。 */
private final String provider;
/** 业务平台;账户/适配器还没解析出来时可能为 null。 */
private final Platform platform;
/** 宿主侧店铺 ID,业务主键的一部分;可能为 null。 */
@ -123,8 +123,8 @@ public final class CallRecord { @@ -123,8 +123,8 @@ public final class CallRecord {
return requestId;
}
/** 接入通道;未解析出账户/适配器时为 null。 */
public ChannelProvider provider() {
/** 接入通道名;未解析出账户/适配器时为 null。 */
public String provider() {
return provider;
}
@ -250,8 +250,8 @@ public final class CallRecord { @@ -250,8 +250,8 @@ public final class CallRecord {
private Instant occurredAt = Instant.EPOCH;
/** 我方链路 ID;默认 null。 */
private String requestId;
/** 接入通道;默认 null。 */
private ChannelProvider provider;
/** 接入通道名;默认 null。 */
private String provider;
/** 业务平台;默认 null。 */
private Platform platform;
/** 宿主侧店铺 ID;默认 null。 */
@ -296,11 +296,18 @@ public final class CallRecord { @@ -296,11 +296,18 @@ public final class CallRecord {
}
/** 接入通道。 */
public Builder provider(ChannelProvider provider) {
/** 接入通道名。 */
public Builder provider(String provider) {
this.provider = provider;
return this;
}
/** 接入通道枚举;写入时取 {@link ChannelProvider#name()}。 */
public Builder provider(ChannelProvider provider) {
this.provider = provider == null ? null : provider.name();
return this;
}
/** 业务平台。 */
public Builder platform(Platform platform) {
this.platform = platform;

29
sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java

@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
package common.ecommerce.shared.audit;
import java.time.Clock;
/**
* 一次门面调用可供埋点读取的维度。渠道域的 {@code ChannelContext}、
* 仓库域的 {@code WarehouseContext} 都实现它,因此 {@link CallSupport} 可以放在
* 共享层,两个域各传自己的上下文。
*/
public interface CallScope {
/** <b>我方</b>链路 ID。 */
String requestId();
/** 接入通道名(渠道 provider / 仓库 provider)。 */
String providerName();
/** 业务平台名;仓库域没有平台概念,返回 null。 */
String platformName();
/** 宿主侧店铺 ID;仓库域返回 null。 */
String omsStoreId();
/** 渠道侧店铺 ID;仓库域返回 null。 */
String externalStoreId();
/** 取调用耗时的时钟。 */
Clock clock();
}

103
channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java → sdk-common/src/main/java/common/ecommerce/shared/audit/CallSupport.java

@ -1,10 +1,4 @@ @@ -1,10 +1,4 @@
package common.ecommerce.channel.sdk;
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;
package common.ecommerce.shared.audit;
import java.time.Instant;
import java.util.Collections;
@ -12,18 +6,21 @@ import java.util.LinkedHashMap; @@ -12,18 +6,21 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Supplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 门面埋点工具:统计耗时、结果数量与异常,生成 {@link CallRecord} 并回调
* {@link CallObserver}。
* {@link CallObserver}。渠道域与仓库域共用,调用方传自己的 {@link CallScope}。
*
* <p>不是公开 API,只给 core 内部的门面使用。SDK 不写日志目的地,
* <p>不是公开 API,只给门面内部使用。SDK 不写日志目的地,
* 落库 / 发 MQ / 接监控都交给宿主实现的 {@link CallObserver}。</p>
*
* <p><b>约定</b>:</p>
* <ul>
* <li>观察者异常一律吞掉并打 WARN,绝不影响业务调用;</li>
* <li>业务异常原样抛出,不包装、不改变类型;</li>
* <li>耗时用 {@code ChannelContext} 的时钟,测试注入固定时钟时为 0。</li>
* <li>耗时用 {@link CallScope#clock()},测试注入固定时钟时为 0。</li>
* </ul>
*/
public final class CallSupport {
@ -33,9 +30,7 @@ public final class CallSupport { @@ -33,9 +30,7 @@ public final class CallSupport {
/** 结果数量不适用(单对象、写操作等)。 */
public static final int NO_COUNT = -1;
/**
* 门面埋点工具,禁止实例化。
*/
/** 工具类,禁止实例化。 */
private CallSupport() {
}
@ -52,7 +47,7 @@ public final class CallSupport { @@ -52,7 +47,7 @@ public final class CallSupport {
if (keyValues.length % 2 != 0) {
throw new IllegalArgumentException("params must be key/value pairs");
}
Map<String, Object> map = new LinkedHashMap<>();
Map<String, Object> map = new LinkedHashMap<String, Object>();
for (int i = 0; i < keyValues.length; i += 2) {
Object key = keyValues[i];
if (key == null) {
@ -63,11 +58,7 @@ public final class CallSupport { @@ -63,11 +58,7 @@ public final class CallSupport {
return map;
}
/**
* 结果数量提取器;不适用时返回 {@link #NO_COUNT}。
*
* @param <T> 门面方法的返回类型
*/
/** 结果数量提取器;不适用时返回 {@link #NO_COUNT}。 */
public interface ResultSize<T> {
/** 返回结果条目数;不适用时返回 {@link CallSupport#NO_COUNT}。 */
@ -77,22 +68,15 @@ public final class CallSupport { @@ -77,22 +68,15 @@ public final class CallSupport {
/**
* 结果摘要:数量 + 失败数 + 业务码 + 结论。
*
* <p>批处理能力(审核发货、编辑订单)平台会逐单返回成败,
* 只要没有异常,旧实现就会记成 {@code SUCCESS};用本类型可以标出
* {@link CallOutcome#PARTIAL} 或 {@link CallOutcome#FAILURE}。</p>
* <p>批处理能力平台会逐单返回成败,只要没有异常,旧实现就会记成
* {@code SUCCESS};用本类型可以标出 {@link CallOutcome#PARTIAL} 或
* {@link CallOutcome#FAILURE}。</p>
*/
public static final class ResultSummary {
/** 本次调用的结论:成功 / 部分成功 / 失败。 */
private final CallOutcome outcome;
/** 结果条目数;不适用时为 {@link #NO_COUNT}。 */
private final int resultCount;
/** 失败条目数;单对象失败时常用 1。 */
private final int failedCount;
/** 平台返回的业务码,可为 null。 */
private final String resultCode;
private ResultSummary(CallOutcome outcome, int resultCount, int failedCount, String resultCode) {
@ -138,11 +122,7 @@ public final class CallSupport { @@ -138,11 +122,7 @@ public final class CallSupport {
}
}
/**
* 结果摘要提取器。
*
* @param <T> 门面方法的返回类型
*/
/** 结果摘要提取器。 */
public interface ResultMapper<T> {
/**
@ -157,18 +137,17 @@ public final class CallSupport { @@ -157,18 +137,17 @@ public final class CallSupport {
* 执行一次门面调用并记录日志(只关心数量)。
*
* @param observer 观察者;null 等价于 {@link CallObserver#NOOP}
* @param ctx 本次调用上下文(提供账户、链路 ID、时钟)
* @param scope 本次调用维度(链路 ID、provider、时钟等)
* @param operation 操作名,如 {@code salesOrders.pull}
* @param params 参数摘要,见 {@link #params(Object...)}
* @param resultSize 结果数量提取器;不关心数量时传 {@code null}
* @param action 真正的适配器调用
*/
public static <T> T observe(CallObserver observer, ChannelContext ctx, String operation,
public static <T> T observe(CallObserver observer, CallScope scope, String operation,
Map<String, Object> params, ResultSize<T> resultSize,
Supplier<T> action) {
return observeSummary(observer, ctx, operation, params,
return observeSummary(observer, scope, operation, params,
new ResultMapper<T>() {
/** 只关心数量:null 结果或未提供提取器时记 NO_COUNT。 */
@Override
public ResultSummary summarize(T result) {
if (result == null || resultSize == null) {
@ -184,23 +163,20 @@ public final class CallSupport { @@ -184,23 +163,20 @@ public final class CallSupport {
* 执行一次门面调用并记录日志(可区分成功 / 部分成功 / 失败)。
*
* <p>业务异常原样抛出;观察者异常吞掉并打 WARN。</p>
*
* @param mapper 结果摘要提取器;抛异常时按 {@code SUCCESS + NO_COUNT} 兜底,
* 不影响业务返回值
*/
public static <T> T observeSummary(CallObserver observer, ChannelContext ctx, String operation,
public static <T> T observeSummary(CallObserver observer, CallScope scope, String operation,
Map<String, Object> params, ResultMapper<T> mapper,
Supplier<T> action) {
CallObserver effective = observer == null ? CallObserver.NOOP : observer;
Instant startedAt = Instant.now(ctx.clock());
long startedMillis = ctx.clock().millis();
Instant startedAt = Instant.now(scope.clock());
long startedMillis = scope.clock().millis();
try {
T result = action.get();
notifyObserver(effective, ctx, operation, params,
notifyObserver(effective, scope, operation, params,
summarize(mapper, result), null, startedAt, startedMillis);
return result;
} catch (RuntimeException e) {
notifyObserver(effective, ctx, operation, params,
notifyObserver(effective, scope, operation, params,
null, e, startedAt, startedMillis);
throw e;
}
@ -215,27 +191,24 @@ public final class CallSupport { @@ -215,27 +191,24 @@ public final class CallSupport {
ResultSummary summary = mapper.summarize(result);
return summary == null ? ResultSummary.success(NO_COUNT) : summary;
} catch (RuntimeException e) {
// 摘要提取失败不应该影响业务结果
return ResultSummary.success(NO_COUNT);
}
}
/**
* 组装 {@link CallRecord} 并回调观察者;回调失败只打 WARN,不影响业务。
*/
private static void notifyObserver(CallObserver observer, ChannelContext ctx, String operation,
/** 组装 {@link CallRecord} 并回调观察者;回调失败只打 WARN,不影响业务。 */
private static void notifyObserver(CallObserver observer, CallScope scope, String operation,
Map<String, Object> params, ResultSummary summary,
RuntimeException error,
Instant startedAt, long startedMillis) {
CallRecord.Builder record = CallRecord.builder()
.occurredAt(startedAt)
.requestId(ctx.requestId())
.provider(ctx.provider())
.platform(ctx.platform())
.omsStoreId(ctx.omsStoreId())
.externalStoreId(ctx.account() == null ? null : ctx.account().externalStoreId())
.requestId(scope.requestId())
.provider(scope.providerName())
.platform(platformOf(scope))
.omsStoreId(scope.omsStoreId())
.externalStoreId(scope.externalStoreId())
.operation(operation)
.durationMillis(Math.max(0L, ctx.clock().millis() - startedMillis))
.durationMillis(Math.max(0L, scope.clock().millis() - startedMillis))
.params(params);
if (error != null) {
@ -252,9 +225,21 @@ public final class CallSupport { @@ -252,9 +225,21 @@ public final class CallSupport {
try {
observer.onCall(record.build());
} catch (RuntimeException e) {
// 观察者自己的问题不能影响业务调用,只在自己的日志里留痕
LOG.warn("sdk call observer failed, record dropped: op={} requestId={}",
operation, ctx.requestId(), e);
operation, scope.requestId(), e);
}
}
/** 平台名转回枚举;仓库域没有平台概念,返回 null。 */
private static common.ecommerce.shared.model.Platform platformOf(CallScope scope) {
String name = scope.platformName();
if (name == null) {
return null;
}
try {
return common.ecommerce.shared.model.Platform.valueOf(name);
} catch (IllegalArgumentException e) {
return null;
}
}
}

0
shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java → sdk-common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java

0
shared/src/main/java/common/ecommerce/shared/error/AuthException.java → sdk-common/src/main/java/common/ecommerce/shared/error/AuthException.java

0
shared/src/main/java/common/ecommerce/shared/error/ChannelException.java → sdk-common/src/main/java/common/ecommerce/shared/error/ChannelException.java

0
shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java → sdk-common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java

0
shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java → sdk-common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java

0
shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java → sdk-common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java

0
shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java → sdk-common/src/main/java/common/ecommerce/shared/error/RateLimitException.java

0
shared/src/main/java/common/ecommerce/shared/error/TransientException.java → sdk-common/src/main/java/common/ecommerce/shared/error/TransientException.java

0
shared/src/main/java/common/ecommerce/shared/error/ValidationException.java → sdk-common/src/main/java/common/ecommerce/shared/error/ValidationException.java

47
shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java → sdk-common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java

@ -9,6 +9,7 @@ import common.ecommerce.shared.spi.IdempotencyClaim; @@ -9,6 +9,7 @@ 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 common.ecommerce.shared.model.Platform;
import java.time.Clock;
import java.time.Instant;
@ -121,7 +122,7 @@ public final class IdempotencyGuard { @@ -121,7 +122,7 @@ public final class IdempotencyGuard {
* @throws CrossProviderConflictException 已由另一个 provider 完成
* @throws ChannelException 业务键 FAILED_FINAL,或 {@code action} 自己抛出
*/
public <T> WriteResult<T> execute(WriteScope scope, Supplier<T> action, Function<? super T, String> resultRef) {
public <T> WriteResult<T> execute(WriteIdentity scope, Supplier<T> action, Function<? super T, String> resultRef) {
Objects.requireNonNull(scope, "scope");
Objects.requireNonNull(action, "action");
Objects.requireNonNull(resultRef, "resultRef");
@ -131,13 +132,13 @@ public final class IdempotencyGuard { @@ -131,13 +132,13 @@ public final class IdempotencyGuard {
final Instant now = Instant.now(clock);
// 1) 业务键:跨 provider 的最终裁决
IdempotencyClaim business = store.claim(businessKey, owner, scope.provider(), now, claimTtlSeconds);
IdempotencyClaim business = store.claim(businessKey, owner, scope.providerName(), now, claimTtlSeconds);
if (!business.acquired()) {
return handleNotAcquired(scope, business, businessKey, providerKey);
}
// 2) provider 键:识别「平台已写、业务键没来得及记成功」的崩溃窗口
IdempotencyClaim provider = store.claim(providerKey, owner, scope.provider(), now, claimTtlSeconds);
IdempotencyClaim provider = store.claim(providerKey, owner, scope.providerName(), now, claimTtlSeconds);
if (!provider.acquired()) {
if (provider.outcome() == IdempotencyClaim.Outcome.SUCCEEDED) {
store.complete(businessKey, owner, provider.record().resultRef(), Instant.now(clock));
@ -181,7 +182,7 @@ public final class IdempotencyGuard { @@ -181,7 +182,7 @@ public final class IdempotencyGuard {
* <p>只处理非 ACQUIRED 的结果;ACQUIRED 走到这里属于实现缺陷,直接抛
* {@link IllegalStateException}。</p>
*/
private <T> WriteResult<T> handleNotAcquired(WriteScope scope, IdempotencyClaim claim,
private <T> WriteResult<T> handleNotAcquired(WriteIdentity scope, IdempotencyClaim claim,
String businessKey, String providerKey) {
IdempotencyRecord record = claim.record();
switch (claim.outcome()) {
@ -192,9 +193,9 @@ public final class IdempotencyGuard { @@ -192,9 +193,9 @@ public final class IdempotencyGuard {
IdempotencyConflictException ex = new IdempotencyConflictException(ChannelException.builder()
.message("write already in progress: " + providerKey)
.operation(scope.action())
.provider(scope.provider().name())
.provider(scope.providerName())
.omsStoreId(scope.omsStoreId())
.platform(scope.platform()), businessKey);
.platform(platformOf(scope)), businessKey);
WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE,
WriteAudit.Stage.IN_PROGRESS, ex, "owner", record.owner());
throw ex;
@ -203,9 +204,9 @@ public final class IdempotencyGuard { @@ -203,9 +204,9 @@ public final class IdempotencyGuard {
ChannelException ex = ChannelException.builder()
.message("previous attempt failed permanently, manual intervention required: " + businessKey)
.operation(scope.action())
.provider(scope.provider().name())
.provider(scope.providerName())
.omsStoreId(scope.omsStoreId())
.platform(scope.platform())
.platform(platformOf(scope))
.retryable(false)
.build();
WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE,
@ -221,21 +222,21 @@ public final class IdempotencyGuard { @@ -221,21 +222,21 @@ public final class IdempotencyGuard {
* 回放已成功的结果;若原完成方是另一个 provider,则改抛
* {@link CrossProviderConflictException}(不自动跨 provider 重试)。
*/
private <T> WriteResult<T> replay(WriteScope scope, IdempotencyRecord record,
private <T> WriteResult<T> replay(WriteIdentity scope, IdempotencyRecord record,
String businessKey, String providerKey,
WriteAudit.Stage stage) {
if (record.provider() != null && record.provider() != scope.provider()) {
if (record.provider() != null && !record.provider().equals(scope.providerName())) {
CrossProviderConflictException ex = new CrossProviderConflictException(ChannelException.builder()
.message("business action already completed by " + record.provider()
+ ", requested via " + scope.provider() + ": " + businessKey)
+ ", requested via " + scope.providerName() + ": " + businessKey)
.operation(scope.action())
.provider(scope.provider().name())
.provider(scope.providerName())
.omsStoreId(scope.omsStoreId())
.platform(scope.platform())
.retryable(false), record.provider().name());
.platform(platformOf(scope))
.retryable(false), record.provider());
WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE,
WriteAudit.Stage.CROSS_PROVIDER_CONFLICT, ex,
"completedByProvider", record.provider().name());
"completedByProvider", record.provider());
throw ex;
}
WriteAudit.record(observer, clock, scope, CallOutcome.SUCCESS, stage, null,
@ -263,10 +264,24 @@ public final class IdempotencyGuard { @@ -263,10 +264,24 @@ public final class IdempotencyGuard {
*
* @return 无记录时为空 Optional
*/
public Optional<IdempotencyRecord> status(WriteScope scope) {
/** 按业务键查询当前幂等记录,只读查询,供运维排查。 */
public Optional<IdempotencyRecord> status(WriteIdentity scope) {
return store.get(scope.businessKey());
}
/** 平台名转回枚举;仓库域没有平台概念,返回 null。 */
private static Platform platformOf(WriteIdentity scope) {
String name = scope.platformName();
if (name == null) {
return null;
}
try {
return Platform.valueOf(name);
} catch (IllegalArgumentException e) {
return null;
}
}
/** 该状态是否可安全重跑;只有 FAILED_RETRYABLE 返回 true。 */
public static boolean isRetryableStatus(IdempotencyStatus status) {
return status == IdempotencyStatus.FAILED_RETRYABLE;

25
shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java → sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java

@ -15,7 +15,7 @@ import java.util.Map; @@ -15,7 +15,7 @@ import java.util.Map;
* 幂等守卫的埋点:把「抢占结果 + 平台写结果」拼成一条 {@link CallRecord}。
*
* <p>幂等层没有 {@code ChannelContext}(写操作可能先于取视图发生,也不一定绑定连接),
* 所以这里只用 {@link WriteScope} 拼出 provider / platform / omsStoreId,
* 所以这里只用 {@link WriteIdentity} 拼出 provider / platform / omsStoreId,
* 不含 externalStoreId 与链路 requestId。</p>
*
* <p><b>约定</b>:观察者异常一律吞掉并打 WARN,绝不影响写操作本身;
@ -38,7 +38,7 @@ final class WriteAudit { @@ -38,7 +38,7 @@ final class WriteAudit {
}
/** 操作名:{@code writes.<scope.action()>}。 */
static String operation(WriteScope scope) {
static String operation(WriteIdentity scope) {
return OPERATION_PREFIX + scope.action();
}
@ -63,7 +63,7 @@ final class WriteAudit { @@ -63,7 +63,7 @@ final class WriteAudit {
* @param extraKey 额外摘要的键(如 {@code resultRef} / {@code retryable}),可为 null
* @param extraValue 额外摘要的值
*/
static void record(CallObserver observer, Clock clock, WriteScope scope, CallOutcome outcome,
static void record(CallObserver observer, Clock clock, WriteIdentity scope, CallOutcome outcome,
Stage stage, RuntimeException error, String extraKey, Object extraValue) {
Map<String, Object> auditParams = base(scope, stage);
if (extraKey != null) {
@ -81,8 +81,8 @@ final class WriteAudit { @@ -81,8 +81,8 @@ final class WriteAudit {
Instant now = Instant.now(clock);
CallRecord.Builder record = CallRecord.builder()
.occurredAt(now)
.provider(scope.provider())
.platform(scope.platform())
.provider(scope.providerName())
.platform(platformOf(scope))
.omsStoreId(scope.omsStoreId())
.operation(operation(scope))
.outcome(outcome)
@ -97,7 +97,7 @@ final class WriteAudit { @@ -97,7 +97,7 @@ final class WriteAudit {
}
/** 三个固定字段:业务键、provider 键、守卫阶段。 */
private static Map<String, Object> base(WriteScope scope, Stage stage) {
private static Map<String, Object> base(WriteIdentity scope, Stage stage) {
Map<String, Object> map = new LinkedHashMap<String, Object>();
map.put("businessKey", scope.businessKey());
map.put("providerKey", scope.providerKey());
@ -105,6 +105,19 @@ final class WriteAudit { @@ -105,6 +105,19 @@ final class WriteAudit {
return map;
}
/** 平台名转回枚举;仓库域没有平台概念,返回 null。 */
private static common.ecommerce.shared.model.Platform platformOf(WriteIdentity scope) {
String name = scope.platformName();
if (name == null) {
return null;
}
try {
return common.ecommerce.shared.model.Platform.valueOf(name);
} catch (IllegalArgumentException e) {
return null;
}
}
/** 守卫阶段:从抢占到落库的每一步都有名字,便于按 stage 聚合。 */
enum Stage {
/** 业务键已抢占,即将执行平台写。 */

36
sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java

@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
package common.ecommerce.shared.idempotency;
/**
* 一次写操作的标识维度。渠道域与仓库域各自实现:两边的主键模型不同
* (渠道域是 {@code platform + omsStoreId},仓库域是 {@code warehouseCode}),
* 但幂等状态机共用。
*
* <p>实现方负责算出两个键:
* {@link #businessKey()} 跨 provider 共用,{@link #providerKey()} 只在本 provider 内去重。</p>
*/
public interface WriteIdentity {
/** 接入通道名,用于幂等记录与跨 provider 冲突判定;非 null。 */
String providerName();
/** 业务平台名,无平台概念时返回 null。 */
String platformName();
/** 宿主侧店铺 ID;仓库域无此概念,返回 null。 */
String omsStoreId();
/** 渠道侧店铺 ID;仓库域无此概念,返回 null。 */
String externalStoreId();
/** 业务动作名,如 {@code create} / {@code cancel};非 null。 */
String action();
/** 业务自然键,如 {@code PO-1:pkg-1} 或 {@code OB-20261028-000123};非 null。 */
String businessRef();
/** 跨 provider 的业务幂等键;非 null。 */
String businessKey();
/** 单 provider 内的请求幂等键;非 null。 */
String providerKey();
}

0
shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java → sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java

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

Loading…
Cancel
Save