Browse Source
- 新增 HengjianCancelOrderDtos,实现 OutboundCapable.cancel - 恒健要求 orderId + orderNo 双键必填,统一模型允许只给一个: 缺哪个先用列表接口补(详情不回 orderId),补不到则本地拒绝, 不发必然被仓方拒的取消请求 - 列表补回的结果逐条精确比对单号 / id 才用,避免近似结果取消错单 - orderId 用 Long(文档标 INTEGER,九位 id 用 int 会静默错单) - 仓方拒绝取消抛 OutboundCancelBlockedException;认证失败不包装成不可取消 - checkCancel 把 UNKNOWN 也判 BLOCKED,认不出的状态不凭猜下写请求 - 移除已无调用方的 unsupportedOutbound 辅助方法 - 写探针补取消与取消预判用例(需 -Dhengjian.probe.cancelOrderNo) 验证:mvn test 全量通过,恒健 109 个用例 + 2 个探针跳过。 Co-Authored-By: Claude Code <noreply@anthropic.com>master
8 changed files with 495 additions and 49 deletions
@ -0,0 +1,29 @@ |
|||||||
|
package common.ecommerce.hengjian.dto; |
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonInclude; |
||||||
|
|
||||||
|
/** |
||||||
|
* 恒健报文结构:订单取消({@code POST /v1/saleOrder/cancel})。 |
||||||
|
* |
||||||
|
* <p>响应<b>没有 data</b>,只有一个 {@code message}(成功时是「取消成功」)。</p> |
||||||
|
*/ |
||||||
|
public final class HengjianCancelOrderDtos { |
||||||
|
|
||||||
|
private HengjianCancelOrderDtos() { |
||||||
|
} |
||||||
|
|
||||||
|
@JsonInclude(JsonInclude.Include.NON_NULL) |
||||||
|
public static final class CancelOrderRequest { |
||||||
|
|
||||||
|
/** |
||||||
|
* 仓方订单 id;<b>必填</b>。 |
||||||
|
* |
||||||
|
* <p>文档标 INTEGER,这里用 {@link Long}——id 已经是九位数,放宽一位不会更贵, |
||||||
|
* 但真溢出了是静默错单。</p> |
||||||
|
*/ |
||||||
|
public Long orderId; |
||||||
|
|
||||||
|
/** 订单号(来源单号);<b>必填</b>。 */ |
||||||
|
public String orderNo; |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,218 @@ |
|||||||
|
package common.ecommerce.hengjian.adapter; |
||||||
|
|
||||||
|
import common.ecommerce.hengjian.HengjianConstants; |
||||||
|
import common.ecommerce.http.JacksonJsonCodec; |
||||||
|
import common.ecommerce.shared.spi.ChannelSecret; |
||||||
|
import common.ecommerce.shared.testkit.RecordingTransport; |
||||||
|
import common.ecommerce.shared.testkit.Responses; |
||||||
|
import common.ecommerce.warehouse.enums.CancelEligibility; |
||||||
|
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.sdk.WarehouseConnection; |
||||||
|
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||||
|
import org.junit.jupiter.api.Test; |
||||||
|
|
||||||
|
import java.time.Clock; |
||||||
|
import java.time.Instant; |
||||||
|
import java.time.ZoneOffset; |
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals; |
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows; |
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue; |
||||||
|
|
||||||
|
/** |
||||||
|
* 订单取消({@code POST /v1/saleOrder/cancel})契约测试。 |
||||||
|
* |
||||||
|
* <p>重点:恒健要 {@code orderId} + {@code orderNo} 两个都传,而统一模型允许只给一个。 |
||||||
|
* 适配器用列表接口补齐,补不到就本地拒绝,不发必然被拒的请求。</p> |
||||||
|
*/ |
||||||
|
class HengjianCancelOrderTest { |
||||||
|
|
||||||
|
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-13T00:00:00Z"), ZoneOffset.UTC); |
||||||
|
private static final String CANCEL_BODY = |
||||||
|
"{\"statusCode\":200,\"status\":0,\"code\":200,\"message\":\"取消成功\"}"; |
||||||
|
|
||||||
|
private static WarehouseContext ctx() { |
||||||
|
return WarehouseContext.of("HJ-EFCA", WarehouseProvider.HENGJIAN, "EFCA", |
||||||
|
WarehouseConnection.of(HengjianConstants.TEST_BASE_URL, |
||||||
|
ChannelSecret.builder().appSecret("token-1").build()), |
||||||
|
"req-1", CLOCK); |
||||||
|
} |
||||||
|
|
||||||
|
private static HengjianAdapter adapter(RecordingTransport transport) { |
||||||
|
return new HengjianAdapter(transport, new JacksonJsonCodec()); |
||||||
|
} |
||||||
|
|
||||||
|
/** 列表补 id 用的响应:一条精确匹配的单。 */ |
||||||
|
private static final String LOOKUP_BODY = |
||||||
|
"{\"code\":200,\"message\":\"ok\",\"data\":{\"last\":true,\"numberOfElements\":1," |
||||||
|
+ "\"content\":[{\"orderId\":193252852,\"orderNo\":\"OB-1\"," |
||||||
|
+ "\"orderStatusEnum\":\"unshipped\"}]}}"; |
||||||
|
|
||||||
|
private static RecordingTransport cancelling() { |
||||||
|
return RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_FIND_BY_PAGE, req -> Responses.ok(LOOKUP_BODY)) |
||||||
|
.route(HengjianConstants.PATH_ORDER_CANCEL, req -> Responses.ok(CANCEL_BODY)); |
||||||
|
} |
||||||
|
|
||||||
|
// ---------------------------------------------------------------- 两个键都齐
|
||||||
|
|
||||||
|
@Test |
||||||
|
void cancelSendsBothKeys() { |
||||||
|
RecordingTransport transport = cancelling(); |
||||||
|
CancelResult result = adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-1") |
||||||
|
.providerOrderId("193252852") |
||||||
|
.build()); |
||||||
|
|
||||||
|
// 两个键都给时不需要查列表,只有一次取消请求
|
||||||
|
assertEquals(1, transport.dataRequests().size()); |
||||||
|
assertEquals("POST", transport.lastDataRequest().method()); |
||||||
|
assertEquals(HengjianConstants.TEST_BASE_URL + "/v1/saleOrder/cancel", |
||||||
|
transport.lastDataRequest().url()); |
||||||
|
String body = transport.lastDataRequest().body(); |
||||||
|
assertTrue(body.contains("\"orderId\":193252852"), body); |
||||||
|
assertTrue(body.contains("\"orderNo\":\"OB-1\""), body); |
||||||
|
|
||||||
|
assertEquals("OB-1", result.outboundRequestNo()); |
||||||
|
assertEquals("193252852", result.providerOrderId()); |
||||||
|
assertEquals(CancelEligibility.FREE, result.eligibility()); |
||||||
|
assertTrue(result.cancelled()); |
||||||
|
assertEquals("取消成功", result.rawStatus()); |
||||||
|
} |
||||||
|
|
||||||
|
/** orderId 必须是数字:恒健标 INTEGER,字符串会绑不上。 */ |
||||||
|
@Test |
||||||
|
void orderIdIsSentAsNumber() { |
||||||
|
RecordingTransport transport = cancelling(); |
||||||
|
adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-1").providerOrderId("193252852").build()); |
||||||
|
|
||||||
|
String body = transport.lastDataRequest().body(); |
||||||
|
assertTrue(body.contains("\"orderId\":193252852"), body); |
||||||
|
assertTrue(!body.contains("\"orderId\":\"193252852\""), "不能发成字符串,body=" + body); |
||||||
|
} |
||||||
|
|
||||||
|
// ---------------------------------------------------------------- 只给一个键
|
||||||
|
|
||||||
|
/** 只有单号:先用列表补 orderId,再取消。 */ |
||||||
|
@Test |
||||||
|
void cancelResolvesOrderIdFromListWhenOnlyOrderNoGiven() { |
||||||
|
RecordingTransport transport = cancelling(); |
||||||
|
CancelResult result = adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-1").build()); |
||||||
|
|
||||||
|
assertEquals(2, transport.dataRequests().size(), "先查列表补 id,再取消"); |
||||||
|
String lookupUrl = transport.dataRequests().get(0).url(); |
||||||
|
assertTrue(lookupUrl.contains("/v1/saleOrder/findByPage"), lookupUrl); |
||||||
|
assertTrue(lookupUrl.contains("orderNos=OB-1"), lookupUrl); |
||||||
|
String body = transport.lastDataRequest().body(); |
||||||
|
assertTrue(body.contains("\"orderId\":193252852"), body); |
||||||
|
assertEquals("193252852", result.providerOrderId()); |
||||||
|
} |
||||||
|
|
||||||
|
/** 只有 orderId:先用列表补单号,再取消。 */ |
||||||
|
@Test |
||||||
|
void cancelResolvesOrderNoFromListWhenOnlyOrderIdGiven() { |
||||||
|
RecordingTransport transport = cancelling(); |
||||||
|
CancelResult result = adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.providerOrderId("193252852").build()); |
||||||
|
|
||||||
|
String lookupUrl = transport.dataRequests().get(0).url(); |
||||||
|
assertTrue(lookupUrl.contains("orderIds=193252852"), lookupUrl); |
||||||
|
assertEquals("OB-1", result.outboundRequestNo()); |
||||||
|
assertTrue(transport.lastDataRequest().body().contains("\"orderNo\":\"OB-1\"")); |
||||||
|
} |
||||||
|
|
||||||
|
/** 列表查不到这单:本地拒绝,绝不发取消请求。 */ |
||||||
|
@Test |
||||||
|
void cancelRejectsWhenOrderCannotBeFound() { |
||||||
|
RecordingTransport transport = RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_FIND_BY_PAGE, req -> Responses.ok( |
||||||
|
"{\"code\":200,\"message\":\"ok\",\"data\":{\"last\":true," |
||||||
|
+ "\"numberOfElements\":0,\"content\":[]}}")) |
||||||
|
.route(HengjianConstants.PATH_ORDER_CANCEL, req -> Responses.ok(CANCEL_BODY)); |
||||||
|
|
||||||
|
RuntimeException ex = assertThrows(RuntimeException.class, |
||||||
|
() -> adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-NONE").build())); |
||||||
|
|
||||||
|
assertTrue(ex.getMessage().contains("not found"), ex.getMessage()); |
||||||
|
assertTrue(transport.lastDataRequest().url().contains("findByPage"), |
||||||
|
"只能查过列表,不能发取消"); |
||||||
|
} |
||||||
|
|
||||||
|
/** 列表回的是近似结果(单号不相等):不能被拿去取消别的单。 */ |
||||||
|
@Test |
||||||
|
void cancelDoesNotAcceptApproximateMatch() { |
||||||
|
RecordingTransport transport = RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_FIND_BY_PAGE, req -> Responses.ok( |
||||||
|
"{\"code\":200,\"message\":\"ok\",\"data\":{\"last\":true," |
||||||
|
+ "\"numberOfElements\":1,\"content\":[" |
||||||
|
+ "{\"orderId\":1,\"orderNo\":\"OB-123\",\"orderStatusEnum\":\"unshipped\"}]}}")) |
||||||
|
.route(HengjianConstants.PATH_ORDER_CANCEL, req -> Responses.ok(CANCEL_BODY)); |
||||||
|
|
||||||
|
assertThrows(RuntimeException.class, () -> adapter(transport).cancel(ctx(), |
||||||
|
CancelCommand.builder().outboundRequestNo("OB-1").build())); |
||||||
|
assertTrue(transport.lastDataRequest().url().contains("findByPage")); |
||||||
|
} |
||||||
|
|
||||||
|
/** 两个键都没有时直接拒绝(构造期其实已经挡住,这里验证兜底)。 */ |
||||||
|
@Test |
||||||
|
void cancelRejectsWithoutAnyKey() { |
||||||
|
RecordingTransport transport = cancelling(); |
||||||
|
|
||||||
|
assertThrows(RuntimeException.class, |
||||||
|
() -> adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo(null).providerOrderId(null).build())); |
||||||
|
assertTrue(transport.dataRequests().isEmpty()); |
||||||
|
} |
||||||
|
|
||||||
|
// ---------------------------------------------------------------- 失败路径
|
||||||
|
|
||||||
|
/** 仓方拒绝取消:按 OutboundCancelBlockedException 抛,便于与参数错区分。 */ |
||||||
|
@Test |
||||||
|
void businessRejectionIsBlockedException() { |
||||||
|
RecordingTransport transport = RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_CANCEL, req -> Responses.ok( |
||||||
|
"{\"code\":500,\"message\":\"订单已发货,不能取消\"}")); |
||||||
|
|
||||||
|
OutboundCancelBlockedException ex = assertThrows(OutboundCancelBlockedException.class, |
||||||
|
() -> adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-1").providerOrderId("193252852").build())); |
||||||
|
assertTrue(ex.getMessage().contains("订单已发货"), ex.getMessage()); |
||||||
|
assertTrue(!ex.retryable()); |
||||||
|
} |
||||||
|
|
||||||
|
/** 认证失败不能被当成「不可取消」:那是凭据问题,要宿主去刷新。 */ |
||||||
|
@Test |
||||||
|
void authFailureIsNotReportedAsBlocked() { |
||||||
|
RecordingTransport transport = RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_CANCEL, req -> Responses.ok( |
||||||
|
"{\"statusCode\":500,\"status\":1,\"code\":999999," |
||||||
|
+ "\"message\":\"查询失败Unauthorized\"}")); |
||||||
|
|
||||||
|
RuntimeException ex = assertThrows(RuntimeException.class, |
||||||
|
() -> adapter(transport).cancel(ctx(), CancelCommand.builder() |
||||||
|
.outboundRequestNo("OB-1").providerOrderId("193252852").build())); |
||||||
|
assertTrue(!(ex instanceof OutboundCancelBlockedException), |
||||||
|
"认证失败不能包装成不可取消,实际是 " + ex.getClass().getSimpleName()); |
||||||
|
} |
||||||
|
|
||||||
|
// ---------------------------------------------------------------- 预判
|
||||||
|
|
||||||
|
/** 认不出的状态也判 BLOCKED:恒健词表将来可能加值,不能凭猜下发取消。 */ |
||||||
|
@Test |
||||||
|
void unknownStatusIsBlocked() { |
||||||
|
RecordingTransport transport = RecordingTransport.create() |
||||||
|
.route(HengjianConstants.PATH_ORDER_FIND_ONE, req -> Responses.ok( |
||||||
|
"{\"code\":200,\"message\":\"ok\",\"data\":{\"orderNo\":\"OB-1\"," |
||||||
|
+ "\"orderStatusEnum\":\"returned\"}}")); |
||||||
|
|
||||||
|
assertEquals(CancelEligibility.BLOCKED, |
||||||
|
adapter(transport).checkCancel(ctx(), |
||||||
|
common.ecommerce.warehouse.model.OutboundRef.ofRequestNo("OB-1"))); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue