Browse Source

feat(yqn): API 81 补 lineName;确认 code 为字符串形态

两处按文档对齐:

1. lineName(项目名称,非必填)之前没有标准字段,直接丢弃。
   ReturnCommand 增加 lineName(),YqnReturnMapper 下发。仓方按项目分账 /
   路由时缺这个字段会走默认项目,属于静默偏差。

2. API 81 的响应 code 是 **string**("200"),多数接口是数字 200。
   现有 YqnEnvelope 用 stringAt 读再转整数,两种形态本来就能识别——
   但此前没有测试锁定这个行为,改严格数字解析会把退货创建打挂。
   新增 YqnEnvelopeTest(11 个)覆盖:
   数字码 / 字符串码 / 带空白字符串码 / 数字失败码 / 字符串失败码 /
   缺码 / 非数字码 / 空 body / 401 / 429 / 503

全量 406 个测试通过。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 1 week ago
parent
commit
0e539ce12a
  1. 14
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java
  2. 1
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java
  3. 4
      warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java
  4. 119
      warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/http/YqnEnvelopeTest.java

14
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/model/ReturnCommand.java

@ -17,6 +17,8 @@ public final class ReturnCommand { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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;

1
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/adapter/YqnReturnMapper.java

@ -29,6 +29,7 @@ public final class YqnReturnMapper { @@ -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();

4
warehouse-sdk-yqn/src/main/java/common/ecommerce/yqn/http/YqnEnvelope.java

@ -20,6 +20,10 @@ import common.ecommerce.yqn.YqnConstants; @@ -20,6 +20,10 @@ import common.ecommerce.yqn.YqnConstants;
*
* <p>HTTP 恒为 200,成败看 <b>body 里的 {@code code}:200 成功</b>。401/403/429/5xx
* 仍按 HTTP 语义映射,便于网关或代理层直接拒绝时也能正确分类。</p>
*
* <p>{@code code} 的类型各接口不统一:多数是数字 {@code 200},但 API 81(创建销售退货)
* 的文档标成 <b>string</b>。这里统一按文本读再转整数,两种形态都能识别;
* 见 {@code YqnEnvelopeTest}。</p>
*/
public final class YqnEnvelope {

119
warehouse-sdk-yqn/src/test/java/common/ecommerce/yqn/http/YqnEnvelopeTest.java

@ -0,0 +1,119 @@ @@ -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;
/**
* 运去哪响应信封校验。
*
* <p>各接口的业务码类型不统一:多数是数字 {@code 200},但 API 81(创建销售退货)
* 的文档把 {@code code} 标成 <b>string</b>。这里把两种形态都固化下来,
* 避免以后有人把 envelope 改成严格数字解析而把退货创建打挂。</p>
*/
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<String, String> headers() {
Map<String, String> h = new LinkedHashMap<String, String>();
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<String, String> 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"));
}
}
Loading…
Cancel
Save