Browse Source

fix(warehouse): 补齐调用日志覆盖 + 恢复合并丢失的 logisticsProducts

日志这块渠道域和仓域共用同一套 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 <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 1 week ago
parent
commit
ead77e0744
  1. 177
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseOperations.java
  2. 23
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java

177
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"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final TransferCapable capable = (TransferCapable) adapter; final TransferCapable capable = (TransferCapable) adapter;
common.ecommerce.shared.idempotency.WriteResult<TransferOrder> result = return CallSupport.observe(observer, ctx, "warehouse.transfer.create",
guard.execute( CallSupport.params("transferRequestNo", cmd.transferRequestNo()),
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), r -> CallSupport.NO_COUNT,
cmd.transferRequestNo(), "create"), () -> {
() -> capable.create(ctx, cmd), common.ecommerce.shared.idempotency.WriteResult<TransferOrder> result =
order -> order.providerTransferNo()); guard.execute(
if (result.alreadyCompleted()) { WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
// 回放:本次没有调仓,只有上次记录的仓单号 cmd.transferRequestNo(), "create"),
return TransferOrder.builder() () -> capable.create(ctx, cmd),
.transferRequestNo(cmd.transferRequestNo()) order -> order.providerTransferNo());
.providerTransferNo(result.resultRef()) if (result.alreadyCompleted()) {
.build(); // 回放:本次没有调仓,只有上次记录的仓单号
} return TransferOrder.builder()
return result.value(); .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"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final TransferCapable capable = (TransferCapable) adapter; final TransferCapable capable = (TransferCapable) adapter;
guard.execute( CallSupport.observe(observer, ctx, "warehouse.transfer.approve",
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), CallSupport.params("providerTransferNo", transferRequestNo),
transferRequestNo, "approve"), r -> CallSupport.NO_COUNT,
() -> { () -> guard.execute(
capable.approve(ctx, transferRequestNo); WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
return transferRequestNo; transferRequestNo, "approve"),
}, () -> {
ref -> ref); 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"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final TransferCapable capable = (TransferCapable) adapter; final TransferCapable capable = (TransferCapable) adapter;
guard.execute( CallSupport.observe(observer, ctx, "warehouse.transfer.delete",
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), CallSupport.params("providerTransferNo", providerTransferNo),
providerTransferNo, "delete"), r -> CallSupport.NO_COUNT,
() -> { () -> guard.execute(
capable.deleteTransfer(ctx, providerTransferNo); WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
return providerTransferNo; providerTransferNo, "delete"),
}, () -> {
ref -> ref); capable.deleteTransfer(ctx, providerTransferNo);
return providerTransferNo;
},
ref -> ref));
} }
/** 库存视图。 */ /** 库存视图。 */
@ -245,6 +256,19 @@ public final class WarehouseOperations {
() -> ((WarehouseDirectoryCapable) adapter).carriers(ctx)); () -> ((WarehouseDirectoryCapable) adapter).carriers(ctx));
} }
/**
* 查物流产品(承运商渠道)清单。只读主数据,不走幂等。
*
* @param warehouseCode 仓 code;null 时用账户配置的仓
*/
public List<LogisticsProduct> 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() { public FeeView fees() {
return new FeeView(); return new FeeView();
@ -262,22 +286,27 @@ public final class WarehouseOperations {
throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final DestructionCapable capable = (DestructionCapable) adapter; final DestructionCapable capable = (DestructionCapable) adapter;
common.ecommerce.shared.idempotency.WriteResult<DestructionOrder> result = return CallSupport.observe(observer, ctx, "warehouse.destruction.create",
guard.execute( CallSupport.params("destructionNo", cmd.destructionNo()),
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), r -> CallSupport.NO_COUNT,
cmd.destructionNo(), "create"), () -> {
() -> capable.create(ctx, cmd), common.ecommerce.shared.idempotency.WriteResult<DestructionOrder> result =
order -> order.providerDestructionId()); guard.execute(
if (result.alreadyCompleted()) { WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
// 回放:本次没有提交销毁,只有上次记录的仓单号 cmd.destructionNo(), "create"),
return DestructionOrder.builder() () -> capable.create(ctx, cmd),
.destructionNo(cmd.destructionNo()) order -> order.providerDestructionId());
.providerDestructionId(result.resultRef()) if (result.alreadyCompleted()) {
.warehouseCode(account.warehouseCode()) // 回放:本次没有提交销毁,只有上次记录的仓单号
.sourceProvider(provider) return DestructionOrder.builder()
.build(); .destructionNo(cmd.destructionNo())
} .providerDestructionId(result.resultRef())
return result.value(); .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"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final InboundCapable capable = (InboundCapable) adapter; final InboundCapable capable = (InboundCapable) adapter;
guard.execute( CallSupport.observe(observer, ctx, "warehouse.inbound.improve",
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), inboundRef, "improve"), CallSupport.params("inboundRef", inboundRef),
() -> { r -> CallSupport.NO_COUNT,
capable.improve(ctx, inboundRef, cmd); () -> guard.execute(
return inboundRef; WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
}, inboundRef, "improve"),
ref -> ref); () -> {
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"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final InboundCapable capable = (InboundCapable) adapter; final InboundCapable capable = (InboundCapable) adapter;
guard.execute( CallSupport.observe(observer, ctx, "warehouse.inbound.submit",
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), inboundRef, "submit"), CallSupport.params("inboundRef", inboundRef),
() -> { r -> CallSupport.NO_COUNT,
capable.submit(ctx, inboundRef); () -> guard.execute(
return inboundRef; WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
}, inboundRef, "submit"),
ref -> ref); () -> {
capable.submit(ctx, inboundRef);
return inboundRef;
},
ref -> ref));
} }
/** BOL 文档。 */ /** BOL 文档。 */
@ -517,14 +554,18 @@ public final class WarehouseOperations {
throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations"); throw new IllegalStateException("WarehouseSdk requires an idempotencyStore for write operations");
} }
final WarehouseReturnCapable capable = (WarehouseReturnCapable) adapter; final WarehouseReturnCapable capable = (WarehouseReturnCapable) adapter;
guard.execute( CallSupport.observe(observer, ctx, "warehouse.return.process",
WarehouseWriteScope.of(provider.name(), account.warehouseCode(), CallSupport.params("providerReturnNo", cmd.providerReturnNo(),
cmd.providerReturnNo() + ':' + cmd.lineId(), "process"), "lineId", cmd.lineId()),
() -> { r -> CallSupport.NO_COUNT,
capable.process(ctx, cmd); () -> guard.execute(
return cmd; WarehouseWriteScope.of(provider.name(), account.warehouseCode(),
}, cmd.providerReturnNo() + ':' + cmd.lineId(), "process"),
c -> null); () -> {
capable.process(ctx, cmd);
return cmd;
},
c -> null));
} }
} }

23
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); throw new WarehouseUnsupportedCapabilityException(WarehouseCapability.WEBHOOK);
} }
WarehouseWebhookCapable capable = (WarehouseWebhookCapable) adapter; WarehouseWebhookCapable capable = (WarehouseWebhookCapable) adapter;
capable.verify(secret, headers, rawBody, nowMillis);
WarehouseContext ctx = newContextForWebhook(provider, secret, rawBody); 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。 */ /** 回调没有仓编码与端点,只带 provider 与链路 id。 */
@ -266,7 +273,17 @@ public final class WarehouseSdk {
return this; return this;
} }
/** 注入调用观察者。 */ /**
* 注入调用观察者(操作日志 / 审计日志)。
*
* <p>每次门面调用结束回调一次 {@link common.ecommerce.shared.audit.CallRecord},
* 成功与失败都记;不注入时为空实现,不做任何记录。SDK 不落盘、不起线程,
* 落库 / MQ / 监控由宿主在 {@link CallObserver#onCall} 里实现。</p>
*
* <p>最省事的写法是 {@code callObserver(new Slf4jCallObserver())};
* 需要审计时实现自己的 {@link CallObserver}。观察者抛出的异常会被吞掉并打 WARN,
* 不会影响业务调用。</p>
*/
public Builder callObserver(CallObserver observer) { public Builder callObserver(CallObserver observer) {
this.callObserver = observer; this.callObserver = observer;
return this; return this;

Loading…
Cancel
Save