Browse Source
- 删除订单 POST api.delete_order:order_no / ckh 二选一,空 body, 按状态分流(待审核→删除、待发货→已取消、拣货/已拣货→已拦截), 统一映射为 CancelResult - 删除转运 POST fba.delete_fba:必填 order_no,仅待审核可删 取消资格预判: - 信仓没有独立预判接口,checkCancel 走订单详情按状态推断 - SHIPPED / CANCELLED / INTERCEPTED / DELETED / UNKNOWN → BLOCKED, 其余状态 → FREE - 查询失败直接抛出,不猜成 FREE,避免下发注定被拒的写请求 - 仓拒绝删除时抛 OutboundCancelBlockedException,与参数错误区分 core 只新增、不修改: - TransferCapable 增加 default deleteTransfer(ctx, providerTransferNo) - WarehouseOperations 增加 deleteTransfer,走幂等守卫, 动作键 warehouseCode + providerTransferNo + delete Co-Authored-By: Claude Code <noreply@anthropic.com>feature/supplier-lingxing
8 changed files with 379 additions and 12 deletions
@ -0,0 +1,158 @@
@@ -0,0 +1,158 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.error.PlatformBusinessException; |
||||
import common.ecommerce.shared.spi.ChannelSecret; |
||||
import common.ecommerce.shared.testkit.InMemoryLockProvider; |
||||
import common.ecommerce.shared.testkit.InMemoryTokenStore; |
||||
import common.ecommerce.shared.testkit.MutableClock; |
||||
import common.ecommerce.shared.testkit.RecordingTransport; |
||||
import common.ecommerce.shared.testkit.Responses; |
||||
import common.ecommerce.warehouse.enums.CancelEligibility; |
||||
import common.ecommerce.warehouse.enums.OutboundStatus; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.error.OutboundCancelBlockedException; |
||||
import common.ecommerce.warehouse.model.CancelCommand; |
||||
import common.ecommerce.warehouse.model.CancelResult; |
||||
import common.ecommerce.warehouse.model.OutboundRef; |
||||
import common.ecommerce.warehouse.sdk.WarehouseConnection; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.xincang.XincangConstants; |
||||
import org.junit.jupiter.api.BeforeEach; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import java.time.Clock; |
||||
import java.time.Duration; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 删除订单({@code POST api.delete_order})与取消资格预判契约测试。 |
||||
*/ |
||||
class XincangCancelOrderTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
private static final String DETAIL_PENDING = "{\"rst\":{" |
||||
+ "\"order_no\":\"DS-1\",\"ckh\":\"OB-1\",\"state\":\"0\",\"state_name\":\"待审核\"," |
||||
+ "\"order_type\":\"common\",\"warehouse_code\":\"NJ-2605\"," |
||||
+ "\"products\":[{\"sku\":\"SKU-A\",\"qty\":\"1\"}]}," |
||||
+ "\"errno\":0,\"err\":\"\",\"trace_id\":\"t-1\"}"; |
||||
|
||||
private RecordingTransport transport; |
||||
private XincangAdapter adapter; |
||||
|
||||
@BeforeEach |
||||
void setUp() { |
||||
transport = RecordingTransport.create(); |
||||
MutableClock clock = MutableClock.atUtc("2026-11-10T00:00:00Z"); |
||||
transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( |
||||
"{\"rst\":{\"id\":\"c-1\",\"token\":\"{T-1}\",\"token_expire_time\":\"" |
||||
+ java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), |
||||
XincangConstants.SYSTEM_ZONE) |
||||
.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) |
||||
+ "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); |
||||
adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), |
||||
new InMemoryTokenStore(), new InMemoryLockProvider(), clock); |
||||
} |
||||
|
||||
private static WarehouseContext ctx() { |
||||
return WarehouseContext.of("XC-NJ-2605", WarehouseProvider.XINCANG, "NJ-2605", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
@Test |
||||
void cancelByProviderOrderId() { |
||||
transport.route(XincangConstants.PATH_ORDER_DELETE, req -> Responses.ok( |
||||
"{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-del\"}")); |
||||
CancelCommand cmd = CancelCommand.builder() |
||||
.providerOrderId("DS-1") |
||||
.outboundRequestNo("OB-1") |
||||
.build(); |
||||
|
||||
CancelResult result = adapter.cancel(ctx(), cmd); |
||||
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertEquals("POST", req.method()); |
||||
assertTrue(req.url().contains("/api.delete_order?"), req.url()); |
||||
assertTrue(req.url().contains("order_no=DS-1"), req.url()); |
||||
assertFalse(req.url().contains("ckh="), "有仓单号时不再传参考号"); |
||||
assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); |
||||
assertNull(req.body(), "删除订单无请求体"); |
||||
|
||||
assertTrue(result.cancelled()); |
||||
assertEquals(CancelEligibility.FREE, result.eligibility()); |
||||
assertEquals("DS-1", result.providerOrderId()); |
||||
assertEquals("OB-1", result.outboundRequestNo()); |
||||
} |
||||
|
||||
@Test |
||||
void cancelFallsBackToReferenceNumber() { |
||||
transport.route(XincangConstants.PATH_ORDER_DELETE, req -> Responses.ok( |
||||
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||
CancelCommand cmd = CancelCommand.builder().outboundRequestNo("OB-1").build(); |
||||
|
||||
adapter.cancel(ctx(), cmd); |
||||
|
||||
String url = transport.lastDataRequest().url(); |
||||
assertTrue(url.contains("ckh=OB-1"), url); |
||||
assertFalse(url.contains("order_no="), url); |
||||
} |
||||
|
||||
@Test |
||||
void refusedDeletionBecomesBlockedException() { |
||||
transport.route(XincangConstants.PATH_ORDER_DELETE, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":-1," |
||||
+ "\"err\":\"DS-BZY01-26101500005在该状态下不允许修改\",\"trace_id\":\"t-bad\"}")); |
||||
|
||||
OutboundCancelBlockedException e = assertThrows(OutboundCancelBlockedException.class, |
||||
() -> adapter.cancel(ctx(), CancelCommand.builder().providerOrderId("DS-1").build())); |
||||
assertTrue(e.getMessage().contains("该状态下不允许修改"), e.getMessage()); |
||||
assertFalse(e.retryable()); |
||||
} |
||||
|
||||
@Test |
||||
void checkCancelUsesOrderStatus() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok(DETAIL_PENDING)); |
||||
|
||||
assertEquals(CancelEligibility.FREE, |
||||
adapter.checkCancel(ctx(), OutboundRef.ofProviderOrderId("DS-1"))); |
||||
} |
||||
|
||||
@Test |
||||
void checkCancelMapsTerminalStatesToBlocked() { |
||||
assertBlocked(OutboundStatus.SHIPPED); |
||||
assertBlocked(OutboundStatus.CANCELLED); |
||||
assertBlocked(OutboundStatus.INTERCEPTED); |
||||
assertBlocked(OutboundStatus.DELETED); |
||||
assertBlocked(OutboundStatus.UNKNOWN); |
||||
} |
||||
|
||||
@Test |
||||
void checkCancelAllowsPreShipmentStates() { |
||||
assertFree(OutboundStatus.PENDING_REVIEW); |
||||
assertFree(OutboundStatus.PENDING_SHIPMENT); |
||||
assertFree(OutboundStatus.REVIEWING); |
||||
assertFree(OutboundStatus.PICKING); |
||||
assertFree(OutboundStatus.PICKED); |
||||
} |
||||
|
||||
@Test |
||||
void checkCancelPropagatesLookupFailure() { |
||||
transport.route(XincangConstants.PATH_ORDER_DETAIL, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":-1,\"err\":\"订单不存在\",\"trace_id\":\"t-404\"}")); |
||||
|
||||
assertThrows(PlatformBusinessException.class, |
||||
() -> adapter.checkCancel(ctx(), OutboundRef.ofProviderOrderId("DS-X"))); |
||||
} |
||||
|
||||
private static void assertBlocked(OutboundStatus status) { |
||||
assertEquals(CancelEligibility.BLOCKED, XincangAdapter.cancelEligibilityOf(status), status.name()); |
||||
} |
||||
|
||||
private static void assertFree(OutboundStatus status) { |
||||
assertEquals(CancelEligibility.FREE, XincangAdapter.cancelEligibilityOf(status), status.name()); |
||||
} |
||||
} |
||||
@ -0,0 +1,89 @@
@@ -0,0 +1,89 @@
|
||||
package common.ecommerce.xincang.adapter; |
||||
|
||||
import common.ecommerce.shared.error.PlatformBusinessException; |
||||
import common.ecommerce.shared.error.ValidationException; |
||||
import common.ecommerce.shared.spi.ChannelSecret; |
||||
import common.ecommerce.shared.testkit.InMemoryLockProvider; |
||||
import common.ecommerce.shared.testkit.InMemoryTokenStore; |
||||
import common.ecommerce.shared.testkit.MutableClock; |
||||
import common.ecommerce.shared.testkit.RecordingTransport; |
||||
import common.ecommerce.shared.testkit.Responses; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.sdk.WarehouseConnection; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.xincang.XincangConstants; |
||||
import org.junit.jupiter.api.BeforeEach; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import java.time.Clock; |
||||
import java.time.Duration; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.*; |
||||
|
||||
/** |
||||
* 删除转运({@code POST fba.delete_fba})契约测试。 |
||||
*/ |
||||
class XincangDeleteTransferTest { |
||||
|
||||
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||
private static final String APP_KEY = "ak-1"; |
||||
|
||||
private RecordingTransport transport; |
||||
private XincangAdapter adapter; |
||||
|
||||
@BeforeEach |
||||
void setUp() { |
||||
transport = RecordingTransport.create(); |
||||
MutableClock clock = MutableClock.atUtc("2026-11-10T00:00:00Z"); |
||||
transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( |
||||
"{\"rst\":{\"id\":\"c-1\",\"token\":\"{T-1}\",\"token_expire_time\":\"" |
||||
+ java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), |
||||
XincangConstants.SYSTEM_ZONE) |
||||
.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) |
||||
+ "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); |
||||
adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), |
||||
new InMemoryTokenStore(), new InMemoryLockProvider(), clock); |
||||
} |
||||
|
||||
private static WarehouseContext ctx() { |
||||
return WarehouseContext.of("XC-CA-15950", WarehouseProvider.XINCANG, "CA-15950", |
||||
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||
.appKey(APP_KEY).appSecret("sk").build()), |
||||
"req-1", Clock.systemUTC()); |
||||
} |
||||
|
||||
@Test |
||||
void deletesTransferByOrderNo() { |
||||
transport.route(XincangConstants.PATH_TRANSFER_DELETE, req -> Responses.ok( |
||||
"{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-del\"}")); |
||||
|
||||
adapter.deleteTransfer(ctx(), "LTL26101500002"); |
||||
|
||||
common.ecommerce.http.HttpRequest req = transport.lastDataRequest(); |
||||
assertEquals("POST", req.method()); |
||||
assertTrue(req.url().contains("/fba.delete_fba?"), req.url()); |
||||
assertTrue(req.url().contains("order_no=LTL26101500002"), req.url()); |
||||
assertTrue(req.url().contains("token=%7BT-1%7D"), req.url()); |
||||
assertNull(req.body(), "删除转运无请求体"); |
||||
} |
||||
|
||||
@Test |
||||
void nonPendingTransferIsRejectedByWarehouse() { |
||||
transport.route(XincangConstants.PATH_TRANSFER_DELETE, req -> Responses.ok( |
||||
"{\"rst\":null,\"errno\":-1,\"err\":\"只有待审核状态的订单可以删除\",\"trace_id\":\"t-bad\"}")); |
||||
|
||||
PlatformBusinessException e = assertThrows(PlatformBusinessException.class, |
||||
() -> adapter.deleteTransfer(ctx(), "LTL-1")); |
||||
assertTrue(e.getMessage().contains("待审核"), e.getMessage()); |
||||
assertFalse(e.retryable()); |
||||
} |
||||
|
||||
@Test |
||||
void blankOrderNoIsRejectedBeforeSending() { |
||||
ValidationException e = assertThrows(ValidationException.class, |
||||
() -> adapter.deleteTransfer(ctx(), " ")); |
||||
assertTrue(e.getMessage().contains("providerTransferNo"), e.getMessage()); |
||||
assertFalse(transport.recorded().stream() |
||||
.anyMatch(r -> r.url().contains(XincangConstants.PATH_TRANSFER_DELETE))); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue