|
|
|
@ -4,6 +4,7 @@ import common.ecommerce.http.HttpRequest; |
|
|
|
import common.ecommerce.http.HttpResponse; |
|
|
|
import common.ecommerce.http.HttpResponse; |
|
|
|
import common.ecommerce.http.HttpTransport; |
|
|
|
import common.ecommerce.http.HttpTransport; |
|
|
|
import common.ecommerce.http.JacksonJsonCodec; |
|
|
|
import common.ecommerce.http.JacksonJsonCodec; |
|
|
|
|
|
|
|
import common.ecommerce.shared.error.PlatformBusinessException; |
|
|
|
import common.ecommerce.shared.support.Page; |
|
|
|
import common.ecommerce.shared.support.Page; |
|
|
|
import common.ecommerce.warehouse.WarehouseCapability; |
|
|
|
import common.ecommerce.warehouse.WarehouseCapability; |
|
|
|
import common.ecommerce.warehouse.WarehouseProvider; |
|
|
|
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.WarehouseProduct; |
|
|
|
import common.ecommerce.warehouse.capability.WarehouseProductCapable; |
|
|
|
import common.ecommerce.warehouse.capability.WarehouseProductCapable; |
|
|
|
import common.ecommerce.warehouse.error.OutboundCancelBlockedException; |
|
|
|
import common.ecommerce.warehouse.error.OutboundCancelBlockedException; |
|
|
|
import common.ecommerce.warehouse.error.OutboundCancelChargeRequiredException; |
|
|
|
|
|
|
|
import common.ecommerce.warehouse.error.WarehouseException; |
|
|
|
import common.ecommerce.warehouse.error.WarehouseException; |
|
|
|
import common.ecommerce.warehouse.model.CancelCommand; |
|
|
|
import common.ecommerce.warehouse.model.CancelCommand; |
|
|
|
import common.ecommerce.warehouse.model.CancelEligibility; |
|
|
|
import common.ecommerce.warehouse.model.CancelEligibility; |
|
|
|
@ -201,45 +201,54 @@ public final class YqnAdapter implements OutboundCapable, WarehouseProductCapabl |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 取消销售订单(API 122)。 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* <p>运去哪没有收费取消的概念,也没有取消费预判:入参只有 {@code orderNo}, |
|
|
|
|
|
|
|
* 响应只有 {@code code/message}。因此 {@link CancelCommand#acceptCharge()} 在这里 |
|
|
|
|
|
|
|
* 不生效;仓判定为不可取消(已拣货 / 已出库)时返回非 200 业务码。</p> |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* <p>「不可取消」按 {@link OutboundCancelBlockedException} 抛出, |
|
|
|
|
|
|
|
* 而不是笼统的业务异常,方便调用方区分「状态不对」与「参数错」。</p> |
|
|
|
|
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public CancelResult cancel(WarehouseContext ctx, CancelCommand cmd) { |
|
|
|
public CancelResult cancel(WarehouseContext ctx, CancelCommand cmd) { |
|
|
|
YqnDtos.CancelOrderRequest body = new YqnDtos.CancelOrderRequest(); |
|
|
|
YqnDtos.CancelOrderRequest body = new YqnDtos.CancelOrderRequest(); |
|
|
|
body.orderNo = cmd.providerOrderId(); |
|
|
|
body.orderNo = orderNoOf(cmd); |
|
|
|
body.customerOrderNo = cmd.outboundRequestNo(); |
|
|
|
|
|
|
|
body.acceptCharge = cmd.acceptCharge(); |
|
|
|
|
|
|
|
body.cancelReason = cmd.reason(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String raw = execute(ctx, YqnConstants.PATH_ORDER_CANCEL, body, "warehouse.outbound.cancel"); |
|
|
|
String raw; |
|
|
|
String cancelType = json.stringAt(raw, "data.cancelType"); |
|
|
|
try { |
|
|
|
CancelEligibility eligibility = YqnOutboundMapper.toEligibility(cancelType); |
|
|
|
raw = execute(ctx, YqnConstants.PATH_ORDER_CANCEL, body, "warehouse.outbound.cancel"); |
|
|
|
|
|
|
|
} catch (PlatformBusinessException e) { |
|
|
|
if (eligibility == CancelEligibility.BLOCKED) { |
|
|
|
// API 122 的失败原因只有 message,无法细分;取消场景统一按「不可取消」表达
|
|
|
|
throw new OutboundCancelBlockedException(WarehouseException.builder() |
|
|
|
throw new OutboundCancelBlockedException(WarehouseException.builder() |
|
|
|
.message("yqn refused cancellation: " + safeRelay(raw)) |
|
|
|
.message("yqn refused cancellation: " + e.getMessage()) |
|
|
|
.operation("warehouse.outbound.cancel") |
|
|
|
.operation("warehouse.outbound.cancel") |
|
|
|
.warehouseCode(ctx.warehouseCode()) |
|
|
|
.warehouseCode(ctx.warehouseCode()) |
|
|
|
.provider(provider().name()) |
|
|
|
.provider(provider().name()) |
|
|
|
.requestId(ctx.requestId()) |
|
|
|
.requestId(ctx.requestId()) |
|
|
|
.rawResponse(safeRelay(raw))); |
|
|
|
.platformCode(e.platformCode()) |
|
|
|
} |
|
|
|
.rawResponse(e.rawResponse()) |
|
|
|
if (eligibility == CancelEligibility.CHARGED && !cmd.acceptCharge()) { |
|
|
|
.retryable(false)); |
|
|
|
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")); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return CancelResult.builder() |
|
|
|
return CancelResult.builder() |
|
|
|
.outboundRequestNo(cmd.outboundRequestNo()) |
|
|
|
.outboundRequestNo(cmd.outboundRequestNo()) |
|
|
|
.providerOrderId(cmd.providerOrderId()) |
|
|
|
.providerOrderId(cmd.providerOrderId()) |
|
|
|
.eligibility(eligibility) |
|
|
|
.eligibility(CancelEligibility.FREE) |
|
|
|
.cancelled(true) |
|
|
|
.cancelled(true) |
|
|
|
.rawStatus(cancelType) |
|
|
|
.rawStatus(json.stringAt(raw, "message")) |
|
|
|
.build(); |
|
|
|
.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 |
|
|
|
@Override |
|
|
|
public List<PackageResult> packages(WarehouseContext ctx, OutboundRef ref) { |
|
|
|
public List<PackageResult> packages(WarehouseContext ctx, OutboundRef ref) { |
|
|
|
YqnDtos.OrderDetail detail = findOne(ctx, orderNoOf(ref), "warehouse.outbound.packages"); |
|
|
|
YqnDtos.OrderDetail detail = findOne(ctx, orderNoOf(ref), "warehouse.outbound.packages"); |
|
|
|
|