From ead77e074493c6f11d2cb6f278b2465e9b678f9f Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Wed, 11 Nov 2026 17:05:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(warehouse):=20=E8=A1=A5=E9=BD=90=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=97=A5=E5=BF=97=E8=A6=86=E7=9B=96=20+=20=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1=E7=9A=84=20logist?= =?UTF-8?q?icsProducts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 日志这块渠道域和仓域共用同一套 CallObserver / Slf4jCallObserver, 但仓域有一批方法没包 CallSupport.observe,没注入观察者时看不出差别, 一旦注入就是「有的调用有日志、有的没有」,排查时很容易误判。 补齐 6 处: - createTransfer / createDestruction(两个写操作) - approveTransfer / deleteTransfer(信仓新加的两个写操作) - improveInbound / submitInbound(信仓头程的两个写操作) - processReturn(退货条目处理) 另外 sdk.webhook(...) 之前完全不走观察者:验签失败、解析出几条 都不进日志。现在包进 "warehouse.webhook.parse",失败时能看到异常类型。 顺带修: - 合并时 WarehouseOperations 丢了 logisticsProducts()(适配器和 LogisticsProductCapable 都在,只是门面入口没了),补回 - WarehouseSdk.Builder.callObserver 的 javadoc 对齐渠道域,写清注入方式 全量 505 个测试通过。 Co-Authored-By: Claude --- .../warehouse/sdk/WarehouseOperations.java | 177 +++++++++++++-------- .../ecommerce/warehouse/sdk/WarehouseSdk.java | 23 ++- 2 files changed, 129 insertions(+), 71 deletions(-) diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java index abedacb..a122c7c 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java @@ -104,20 +104,25 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final TransferCapable capable = (TransferCapable) adapter; - common.ecommerce.shared.idempotency.WriteResult result = - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), - cmd.transferRequestNo(), "create"), - () -> capable.create(ctx, cmd), - order -> order.providerTransferNo()); - if (result.alreadyCompleted()) { - // 回放:本次没有调仓,只有上次记录的仓单号 - return TransferOrder.builder() - .transferRequestNo(cmd.transferRequestNo()) - .providerTransferNo(result.resultRef()) - .build(); - } - return result.value(); + return CallSupport.observe(observer, ctx, "warehouse.transfer.create", + CallSupport.params("transferRequestNo", cmd.transferRequestNo()), + r -> CallSupport.NO_COUNT, + () -> { + common.ecommerce.shared.idempotency.WriteResult result = + guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + cmd.transferRequestNo(), "create"), + () -> capable.create(ctx, cmd), + order -> order.providerTransferNo()); + if (result.alreadyCompleted()) { + // 回放:本次没有调仓,只有上次记录的仓单号 + return TransferOrder.builder() + .transferRequestNo(cmd.transferRequestNo()) + .providerTransferNo(result.resultRef()) + .build(); + } + return result.value(); + }); } /** @@ -132,14 +137,17 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final TransferCapable capable = (TransferCapable) adapter; - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), - transferRequestNo, "approve"), - () -> { - capable.approve(ctx, transferRequestNo); - return transferRequestNo; - }, - ref -> ref); + CallSupport.observe(observer, ctx, "warehouse.transfer.approve", + CallSupport.params("providerTransferNo", transferRequestNo), + r -> CallSupport.NO_COUNT, + () -> guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + transferRequestNo, "approve"), + () -> { + capable.approve(ctx, transferRequestNo); + return transferRequestNo; + }, + ref -> ref)); } /** @@ -168,14 +176,17 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final TransferCapable capable = (TransferCapable) adapter; - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), - providerTransferNo, "delete"), - () -> { - capable.deleteTransfer(ctx, providerTransferNo); - return providerTransferNo; - }, - ref -> ref); + CallSupport.observe(observer, ctx, "warehouse.transfer.delete", + CallSupport.params("providerTransferNo", providerTransferNo), + r -> CallSupport.NO_COUNT, + () -> guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + providerTransferNo, "delete"), + () -> { + capable.deleteTransfer(ctx, providerTransferNo); + return providerTransferNo; + }, + ref -> ref)); } /** 库存视图。 */ @@ -245,6 +256,19 @@ public final class WarehouseOperations { () -> ((WarehouseDirectoryCapable) adapter).carriers(ctx)); } + /** + * 查物流产品(承运商渠道)清单。只读主数据,不走幂等。 + * + * @param warehouseCode 仓 code;null 时用账户配置的仓 + */ + public List logisticsProducts(String warehouseCode) { + require(WarehouseCapability.LOGISTICS_PRODUCT, LogisticsProductCapable.class); + return CallSupport.observe(observer, ctx, "warehouse.logistics.products", + CallSupport.params("warehouseCode", warehouseCode), + List::size, + () -> ((LogisticsProductCapable) adapter).products(ctx, warehouseCode)); + } + /** 费用视图。 */ public FeeView fees() { return new FeeView(); @@ -262,22 +286,27 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final DestructionCapable capable = (DestructionCapable) adapter; - common.ecommerce.shared.idempotency.WriteResult result = - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), - cmd.destructionNo(), "create"), - () -> capable.create(ctx, cmd), - order -> order.providerDestructionId()); - if (result.alreadyCompleted()) { - // 回放:本次没有提交销毁,只有上次记录的仓单号 - return DestructionOrder.builder() - .destructionNo(cmd.destructionNo()) - .providerDestructionId(result.resultRef()) - .warehouseCode(account.warehouseCode()) - .sourceProvider(provider) - .build(); - } - return result.value(); + return CallSupport.observe(observer, ctx, "warehouse.destruction.create", + CallSupport.params("destructionNo", cmd.destructionNo()), + r -> CallSupport.NO_COUNT, + () -> { + common.ecommerce.shared.idempotency.WriteResult result = + guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + cmd.destructionNo(), "create"), + () -> capable.create(ctx, cmd), + order -> order.providerDestructionId()); + if (result.alreadyCompleted()) { + // 回放:本次没有提交销毁,只有上次记录的仓单号 + return DestructionOrder.builder() + .destructionNo(cmd.destructionNo()) + .providerDestructionId(result.resultRef()) + .warehouseCode(account.warehouseCode()) + .sourceProvider(provider) + .build(); + } + return result.value(); + }); } /** 查询销毁计划。 */ @@ -389,13 +418,17 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final InboundCapable capable = (InboundCapable) adapter; - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), inboundRef, "improve"), - () -> { - capable.improve(ctx, inboundRef, cmd); - return inboundRef; - }, - ref -> ref); + CallSupport.observe(observer, ctx, "warehouse.inbound.improve", + CallSupport.params("inboundRef", inboundRef), + r -> CallSupport.NO_COUNT, + () -> guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + inboundRef, "improve"), + () -> { + capable.improve(ctx, inboundRef, cmd); + return inboundRef; + }, + ref -> ref)); } /** @@ -408,13 +441,17 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final InboundCapable capable = (InboundCapable) adapter; - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), inboundRef, "submit"), - () -> { - capable.submit(ctx, inboundRef); - return inboundRef; - }, - ref -> ref); + CallSupport.observe(observer, ctx, "warehouse.inbound.submit", + CallSupport.params("inboundRef", inboundRef), + r -> CallSupport.NO_COUNT, + () -> guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + inboundRef, "submit"), + () -> { + capable.submit(ctx, inboundRef); + return inboundRef; + }, + ref -> ref)); } /** BOL 文档。 */ @@ -517,14 +554,18 @@ public final class WarehouseOperations { throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); } final WarehouseReturnCapable capable = (WarehouseReturnCapable) adapter; - guard.execute( - WarehouseWriteScope.of(provider.name(), account.warehouseCode(), - cmd.providerReturnNo() + ':' + cmd.lineId(), "process"), - () -> { - capable.process(ctx, cmd); - return cmd; - }, - c -> null); + CallSupport.observe(observer, ctx, "warehouse.return.process", + CallSupport.params("providerReturnNo", cmd.providerReturnNo(), + "lineId", cmd.lineId()), + r -> CallSupport.NO_COUNT, + () -> guard.execute( + WarehouseWriteScope.of(provider.name(), account.warehouseCode(), + cmd.providerReturnNo() + ':' + cmd.lineId(), "process"), + () -> { + capable.process(ctx, cmd); + return cmd; + }, + c -> null)); } } diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java index 01a18f8..880782b 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java @@ -144,9 +144,16 @@ public final class WarehouseSdk { throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.WEBHOOK); } WarehouseWebhookCapable capable = (WarehouseWebhookCapable) adapter; - capable.verify(secret, headers, rawBody, nowMillis); WarehouseContext ctx = newContextForWebhook(provider, secret, rawBody); - return capable.parse(ctx, secret, headers, rawBody); + // 回调也走观察者:验签失败与解析条数都要能进日志 + return common.ecommerce.shared.audit.CallSupport.observe(callObserver, ctx, + "warehouse.webhook.parse", + common.ecommerce.shared.audit.CallSupport.params("provider", provider.name()), + List::size, + () -> { + capable.verify(secret, headers, rawBody, nowMillis); + return capable.parse(ctx, secret, headers, rawBody); + }); } /** 回调没有仓编码与端点,只带 provider 与链路 id。 */ @@ -266,7 +273,17 @@ public final class WarehouseSdk { return this; } - /** 注入调用观察者。 */ + /** + * 注入调用观察者(操作日志 / 审计日志)。 + * + *

每次门面调用结束回调一次 {@link common.ecommerce.shared.audit.CallRecord}, + * 成功与失败都记;不注入时为空实现,不做任何记录。SDK 不落盘、不起线程, + * 落库 / MQ / 监控由宿主在 {@link CallObserver#onCall} 里实现。

+ * + *

最省事的写法是 {@code callObserver(new Slf4jCallObserver())}; + * 需要审计时实现自己的 {@link CallObserver}。观察者抛出的异常会被吞掉并打 WARN, + * 不会影响业务调用。

+ */ public Builder callObserver(CallObserver observer) { this.callObserver = observer; return this;