diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/CancelCommand.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/CancelCommand.java index 68f77c8..b211766 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/CancelCommand.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/CancelCommand.java @@ -3,9 +3,9 @@ package common.ecommerce.warehouse.model; /** * 取消命令。 * - *
{@link #acceptCharge()} 必须显式传 true 才会执行收费取消; - * 仓返回 {@code CHARGED} 而这里是 false 时抛 - * {@code OutboundCancelChargeRequiredException}。
+ *{@link #acceptCharge()} 只对报了收费取消的仓有效(如易达云): + * 那类仓返回 {@code CHARGED} 而这里为 false 时抛 + * {@code OutboundCancelChargeRequiredException}。运去哪没有取消费概念,该字段被忽略。
*/ public final class CancelCommand { diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/YqnConstants.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/YqnConstants.java index d83e6c9..55f5525 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/YqnConstants.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/YqnConstants.java @@ -30,8 +30,8 @@ public final class YqnConstants { public static final String PATH_ORDER_CREATE = "/v1/saleOrder/create"; /** 订单详情(API 128):按来源单号查完整订单。 */ public static final String PATH_ORDER_FIND_ONE = "/v1/saleOrder/findOne"; - /** 出库单取消。 */ - public static final String PATH_ORDER_CANCEL = "/saleorder/OrderCancel"; + /** 取消销售订单(API 122)。 */ + public static final String PATH_ORDER_CANCEL = "/v1/saleOrder/cancel"; /** 批量库存查询。 */ public static final String PATH_INVENTORY_BATCH = "/inventory/BatchQueryInventory"; /** 库存调拨出库计划。 */ diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java index 58be3b4..5364680 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnAdapter.java @@ -4,6 +4,7 @@ import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpTransport; import common.ecommerce.http.JacksonJsonCodec; +import common.ecommerce.shared.error.PlatformBusinessException; import common.ecommerce.shared.support.Page; import common.ecommerce.warehouse.WarehouseCapability; import common.ecommerce.warehouse.WarehouseProvider; @@ -11,7 +12,6 @@ import common.ecommerce.warehouse.capability.OutboundCapable; import common.ecommerce.warehouse.capability.WarehouseProduct; import common.ecommerce.warehouse.capability.WarehouseProductCapable; import common.ecommerce.warehouse.error.OutboundCancelBlockedException; -import common.ecommerce.warehouse.error.OutboundCancelChargeRequiredException; import common.ecommerce.warehouse.error.WarehouseException; import common.ecommerce.warehouse.model.CancelCommand; import common.ecommerce.warehouse.model.CancelEligibility; @@ -201,45 +201,54 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl } } + /** + * 取消销售订单(API 122)。 + * + *运去哪没有收费取消的概念,也没有取消费预判:入参只有 {@code orderNo}, + * 响应只有 {@code code/message}。因此 {@link CancelCommand#acceptCharge()} 在这里 + * 不生效;仓判定为不可取消(已拣货 / 已出库)时返回非 200 业务码。
+ * + *「不可取消」按 {@link OutboundCancelBlockedException} 抛出, + * 而不是笼统的业务异常,方便调用方区分「状态不对」与「参数错」。
+ */ @Override public CancelResult cancel(WarehouseContext ctx, CancelCommand cmd) { YqnDtos.CancelOrderRequest body = new YqnDtos.CancelOrderRequest(); - body.orderNo = cmd.providerOrderId(); - body.customerOrderNo = cmd.outboundRequestNo(); - body.acceptCharge = cmd.acceptCharge(); - body.cancelReason = cmd.reason(); + body.orderNo = orderNoOf(cmd); - String raw = execute(ctx, YqnConstants.PATH_ORDER_CANCEL, body, "warehouse.outbound.cancel"); - String cancelType = json.stringAt(raw, "data.cancelType"); - CancelEligibility eligibility = YqnOutboundMapper.toEligibility(cancelType); - - if (eligibility == CancelEligibility.BLOCKED) { + String raw; + try { + raw = execute(ctx, YqnConstants.PATH_ORDER_CANCEL, body, "warehouse.outbound.cancel"); + } catch (PlatformBusinessException e) { + // API 122 的失败原因只有 message,无法细分;取消场景统一按「不可取消」表达 throw new OutboundCancelBlockedException(WarehouseException.builder() - .message("yqn refused cancellation: " + safeRelay(raw)) + .message("yqn refused cancellation: " + e.getMessage()) .operation("warehouse.outbound.cancel") .warehouseCode(ctx.warehouseCode()) .provider(provider().name()) .requestId(ctx.requestId()) - .rawResponse(safeRelay(raw))); - } - if (eligibility == CancelEligibility.CHARGED && !cmd.acceptCharge()) { - throw new OutboundCancelChargeRequiredException(WarehouseException.builder() - .message("yqn cancellation is charged, acceptCharge required") - .operation("warehouse.outbound.cancel") - .warehouseCode(ctx.warehouseCode()) - .provider(provider().name()) - .requestId(ctx.requestId()), - json.stringAt(raw, "data.cancelFee"), json.stringAt(raw, "data.currency")); + .platformCode(e.platformCode()) + .rawResponse(e.rawResponse()) + .retryable(false)); } return CancelResult.builder() .outboundRequestNo(cmd.outboundRequestNo()) .providerOrderId(cmd.providerOrderId()) - .eligibility(eligibility) + .eligibility(CancelEligibility.FREE) .cancelled(true) - .rawStatus(cancelType) + .rawStatus(json.stringAt(raw, "message")) .build(); } + /** 取消命令 → 运去哪订单号:优先来源单号,其次仓单号。 */ + private static String orderNoOf(CancelCommand cmd) { + String orderNo = firstNonBlank(cmd.outboundRequestNo(), cmd.providerOrderId()); + if (orderNo == null) { + throw new IllegalArgumentException("yqn needs outboundRequestNo to cancel an order"); + } + return orderNo; + } + @Override public List