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 packages(WarehouseContext ctx, OutboundRef ref) { YqnDtos.OrderDetail detail = findOne(ctx, orderNoOf(ref), "warehouse.outbound.packages"); diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java index 6be7db8..ed03fa0 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnOutboundMapper.java @@ -375,24 +375,6 @@ public final class YqnOutboundMapper { return OutboundStatus.SUBMITTED; } - /** 运去哪取消类型 → 统一三态;未知按 BLOCKED,宁可拦住也不误放行。 */ - public static CancelEligibility toEligibility(String cancelType) { - if (cancelType == null) { - return CancelEligibility.BLOCKED; - } - String s = cancelType.trim().toUpperCase(); - if (s.contains("FREE")) { - return CancelEligibility.FREE; - } - if (s.contains("CHARGE")) { - return CancelEligibility.CHARGED; - } - if (s.contains("BLOCK")) { - return CancelEligibility.BLOCKED; - } - return CancelEligibility.BLOCKED; - } - /** 解析运去哪时间;失败返回 null,不因时间格式阻断业务。 */ static Instant parseTime(String value, ZoneId zone) { if (value == null || value.trim().isEmpty()) { diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java index 87268d1..d0a4144 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/dto/YqnDtos.java @@ -320,24 +320,13 @@ public final class YqnDtos { } } - /** 取消请求。 */ + /** + * 取消销售订单请求(API 122):只有 {@code orderNo}。 + */ public static final class CancelOrderRequest { + /** 订单号,即下单时的来源单号。 */ public String orderNo; - public String customerOrderNo; - /** 是否接受取消费用。 */ - public boolean acceptCharge; - public String cancelReason; - } - - /** 取消响应。 */ - public static final class CancelOrderResponse { - - public String orderNo; - /** FREE / CHARGED / BLOCKED。 */ - public String cancelType; - public String cancelFee; - public String currency; } /** diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java index 7fe5f93..f69d52c 100644 --- a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/adapter/YqnAdapterTest.java @@ -154,22 +154,34 @@ class YqnAdapterTest { } @Test - void cancelChargedWithoutAcceptThrows() { + void cancelSendsOnlyOrderNoAndSucceeds() { RecordingTransport transport = RecordingTransport.create() .route(YqnConstants.PATH_ORDER_CANCEL, req -> Responses.ok( - "{\"statusCode\":200,\"status\":0,\"code\":200,\"data\":{\"cancelType\":\"CHARGED\"," - + "\"cancelFee\":\"5.00\",\"currency\":\"USD\"}}")); + "{\"statusCode\":200,\"status\":0,\"code\":\"200\",\"message\":\"取消成功\"}")); YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); - common.ecommerce.warehouse.model.CancelCommand cmd = - common.ecommerce.warehouse.model.CancelCommand.builder() - .outboundRequestNo("OB-5").acceptCharge(false).build(); + common.ecommerce.warehouse.model.CancelResult result = + adapter.cancel(ctx(), common.ecommerce.warehouse.model.CancelCommand.builder() + .outboundRequestNo("OB-5").acceptCharge(true).build()); - common.ecommerce.warehouse.error.OutboundCancelChargeRequiredException ex = + assertTrue(result.cancelled()); + assertEquals(CancelEligibility.FREE, result.eligibility()); + assertEquals("{\"orderNo\":\"OB-5\"}", transport.lastDataRequest().body()); + } + + @Test + void cancelRefusedBecomesBlocked() { + RecordingTransport transport = RecordingTransport.create() + .route(YqnConstants.PATH_ORDER_CANCEL, req -> Responses.ok( + "{\"statusCode\":200,\"status\":0,\"code\":\"500\",\"message\":\"订单已出库不可取消\"}")); + YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); + + common.ecommerce.warehouse.error.OutboundCancelBlockedException ex = org.junit.jupiter.api.Assertions.assertThrows( - common.ecommerce.warehouse.error.OutboundCancelChargeRequiredException.class, - () -> adapter.cancel(ctx(), cmd)); - assertEquals("5.00", ex.cancelFee()); + common.ecommerce.warehouse.error.OutboundCancelBlockedException.class, + () -> adapter.cancel(ctx(), common.ecommerce.warehouse.model.CancelCommand.builder() + .outboundRequestNo("OB-5").build())); + assertTrue(ex.getMessage().contains("不可取消"), ex.getMessage()); } @Test