diff --git a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java index 6e67a7d..cb5ce7a 100644 --- a/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java +++ b/warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java @@ -17,6 +17,8 @@ public final class ReturnCommand { private final String returnRequestNo; private final String warehouseId; + /** 项目名称;仓方按项目分账 / 路由时使用,null 表示用仓方默认。 */ + private final String lineName; /** 关联的销售订单号(我们下发的 {@code orderNo})。 */ private final String saleOrderNo; /** 退货运单号。 */ @@ -32,6 +34,7 @@ public final class ReturnCommand { private ReturnCommand(Builder b) { this.returnRequestNo = require(b.returnRequestNo, "returnRequestNo"); this.warehouseId = b.warehouseId; + this.lineName = b.lineName; this.saleOrderNo = require(b.saleOrderNo, "saleOrderNo"); this.returnTrackingNo = require(b.returnTrackingNo, "returnTrackingNo"); this.carrierCode = require(b.carrierCode, "carrierCode"); @@ -58,6 +61,11 @@ public final class ReturnCommand { return warehouseId; } + /** 项目名称;null 表示用仓方默认。 */ + public String lineName() { + return lineName; + } + /** 关联的销售订单号,必填。 */ public String saleOrderNo() { return saleOrderNo; @@ -136,6 +144,7 @@ public final class ReturnCommand { private String returnRequestNo; private String warehouseId; + private String lineName; private String saleOrderNo; private String returnTrackingNo; private String carrierCode; @@ -154,6 +163,11 @@ public final class ReturnCommand { return this; } + public Builder lineName(String v) { + this.lineName = v; + return this; + } + public Builder saleOrderNo(String v) { this.saleOrderNo = v; return this; diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java index ff0a91e..396c44f 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java @@ -29,6 +29,7 @@ public final class YqnReturnMapper { YqnCreateSaleReturnDtos.CreateSaleReturnRequest req = new YqnCreateSaleReturnDtos.CreateSaleReturnRequest(); req.warehouseCode = warehouseCode; req.orderNo = cmd.returnRequestNo(); + req.lineName = cmd.lineName(); req.saleOrderNo = cmd.saleOrderNo(); req.returnTrackingNo = cmd.returnTrackingNo(); req.carrierCode = cmd.carrierCode(); diff --git a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java index 593eb12..da31a1a 100644 --- a/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java +++ b/warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java @@ -20,6 +20,10 @@ import common.ecommerce.yqn.YqnConstants; * *

HTTP 恒为 200,成败看 body 里的 {@code code}:200 成功。401/403/429/5xx * 仍按 HTTP 语义映射,便于网关或代理层直接拒绝时也能正确分类。

+ * + *

{@code code} 的类型各接口不统一:多数是数字 {@code 200},但 API 81(创建销售退货) + * 的文档标成 string。这里统一按文本读再转整数,两种形态都能识别; + * 见 {@code YqnEnvelopeTest}。

*/ public final class YqnEnvelope { diff --git a/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/http/YqnEnvelopeTest.java b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/http/YqnEnvelopeTest.java new file mode 100644 index 0000000..d04c143 --- /dev/null +++ b/warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/http/YqnEnvelopeTest.java @@ -0,0 +1,119 @@ +package common.ecommerce.yqn.http; + +import common.ecommerce.http.HttpResponse; +import common.ecommerce.http.JacksonJsonCodec; +import common.ecommerce.shared.error.PlatformBusinessException; +import common.ecommerce.shared.error.ValidationException; +import org.junit.jupiter.api.Test; + +import java.util.LinkedHashMap; +import java.util.Map; + +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 200},但 API 81(创建销售退货) + * 的文档把 {@code code} 标成 string。这里把两种形态都固化下来, + * 避免以后有人把 envelope 改成严格数字解析而把退货创建打挂。

+ */ +class YqnEnvelopeTest { + + private static final JacksonJsonCodec JSON = new JacksonJsonCodec(); + + private static HttpResponse ok(String body) { + return HttpResponse.of(200, headers(), body, 0L); + } + + private static Map headers() { + Map h = new LinkedHashMap(); + h.put("Content-Type", "application/json"); + return h; + } + + private static YqnEnvelope parse(String body) { + return YqnEnvelope.of(ok(body), JSON, "warehouse.test", "WH-1", "req-1"); + } + + // ---------------------------------------------------------------- 成功码 + + @Test + void acceptsNumericCode() { + assertEquals("{\"code\":200,\"message\":\"ok\"}", + parse("{\"code\":200,\"message\":\"ok\"}").body()); + } + + /** API 81 的 code 是字符串,必须同样按成功处理。 */ + @Test + void acceptsStringCode() { + String body = "{\"code\":\"200\",\"message\":\"ok\",\"statusCode\":1,\"status\":1}"; + assertEquals(body, parse(body).body()); + } + + @Test + void stringCodeWithWhitespaceIsAccepted() { + parse("{\"code\":\" 200 \",\"message\":\"ok\"}"); + } + + // ---------------------------------------------------------------- 失败码 + + @Test + void numericFailureIsBusinessError() { + PlatformBusinessException ex = assertThrows(PlatformBusinessException.class, + () -> parse("{\"code\":500,\"message\":\"boom\"}")); + assertTrue(ex.getMessage().contains("500"), ex.getMessage()); + } + + @Test + void stringFailureIsBusinessError() { + PlatformBusinessException ex = assertThrows(PlatformBusinessException.class, + () -> parse("{\"code\":\"500\",\"message\":\"boom\"}")); + assertTrue(ex.getMessage().contains("500"), ex.getMessage()); + } + + /** 缺 code 时才报「没有业务码」,不能把字符串码也当缺失。 */ + @Test + void missingCodeIsValidationError() { + ValidationException ex = assertThrows(ValidationException.class, + () -> parse("{\"message\":\"ok\"}")); + assertTrue(ex.getMessage().contains("no business code"), ex.getMessage()); + } + + @Test + void nonNumericCodeIsValidationError() { + assertThrows(ValidationException.class, () -> parse("{\"code\":\"abc\"}")); + } + + @Test + void emptyBodyIsValidationError() { + assertThrows(ValidationException.class, () -> parse("")); + } + + // ---------------------------------------------------------------- HTTP 层 + + @Test + void httpUnauthorizedIsAuthError() { + HttpResponse resp = HttpResponse.of(401, headers(), "{}", 0L); + assertThrows(common.ecommerce.shared.error.AuthException.class, + () -> YqnEnvelope.of(resp, JSON, "op", "WH-1", "req-1")); + } + + @Test + void httpTooManyRequestsIsRateLimitError() { + Map h = headers(); + h.put("Retry-After", "2"); + HttpResponse resp = HttpResponse.of(429, h, "{}", 0L); + assertThrows(common.ecommerce.shared.error.RateLimitException.class, + () -> YqnEnvelope.of(resp, JSON, "op", "WH-1", "req-1")); + } + + @Test + void httpServerErrorIsTransient() { + HttpResponse resp = HttpResponse.of(503, headers(), "{}", 0L); + assertThrows(common.ecommerce.shared.error.TransientException.class, + () -> YqnEnvelope.of(resp, JSON, "op", "WH-1", "req-1")); + } +}