Browse Source
按「仓方给了就加,并标注来源字段」补齐四类: 1. 创建入库计划(API 97)请求侧 11 个字段,之前完全没下发: lineCode / shipmentId / referenceId / attachInfoItems / transportType / deliveryType / goodsSize / tmsNos / carrier / socFlag / palletFlag。 其中 attachInfoItems 意味着之前入库单无法随单传附件(面单/装箱单/BOL)。 tmsNos 运去哪是逗号分割的字符串,出参用 List 承接。 2. 查询入库计划(API 101)响应侧 10 个字段: lineName / shipmentId / referenceId / shipmentNo / goodsType / actualShipDate / cartonTotalWeight / cartonTotalVolume / 四种柜型数量与柜号。 柜型新增 InboundOrder.ContainerInfo(GP20/GP40/HQ40/HQ45 + 数量 + 柜号 + 仓方原值),只对给了值的柜型产对象。 3. 商品(API 115)11 个字段: expirationControl / expirationDate / packedQty / packedLength/Width/Height/ Weight / isInsuranceFlag / isInsuranceRate / snMgmtMode / lotControl。 顺带修海关币种:之前把申报额无脑贴成 USD,非美元会被静默算错; 现在非 USD 直接拒绝,由调用方换算。 4. 物流轨迹(API 189): parcel 实重实尺(oz/inch 统一换算成 g/cm 后落模型,宿主不用各仓换算) + carrierDetail 的承诺送达日期 / 始发地 / 目的地。 另把 WarehouseReturn.Attachment 合并为通用 WarehouseAttachment, 与出库/入库附件统一。 新增 YqnExtraFieldsTest(9 个)。全量 486 个测试通过。 Co-Authored-By: Claude <noreply@anthropic.com>feature/supplier-lingxing
12 changed files with 1235 additions and 66 deletions
@ -0,0 +1,263 @@
@@ -0,0 +1,263 @@
|
||||
package common.ecommerce.yqn.adapter; |
||||
|
||||
import common.ecommerce.http.JacksonJsonCodec; |
||||
import common.ecommerce.shared.spi.ChannelSecret; |
||||
import common.ecommerce.shared.support.Money; |
||||
import common.ecommerce.shared.testkit.RecordingTransport; |
||||
import common.ecommerce.shared.testkit.Responses; |
||||
import common.ecommerce.warehouse.capability.WarehouseProduct; |
||||
import common.ecommerce.warehouse.enums.WarehouseProvider; |
||||
import common.ecommerce.warehouse.model.InboundCommand; |
||||
import common.ecommerce.warehouse.model.InboundOrder; |
||||
import common.ecommerce.warehouse.model.TrackingInfo; |
||||
import common.ecommerce.warehouse.model.WarehouseAttachment; |
||||
import common.ecommerce.warehouse.sdk.WarehouseConnection; |
||||
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||
import common.ecommerce.yqn.YqnConstants; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.time.Clock; |
||||
import java.time.Instant; |
||||
import java.time.LocalDate; |
||||
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; |
||||
|
||||
/** |
||||
* 本轮补齐的「仓方有、模型没有」字段:入库请求/响应、商品、轨迹。 |
||||
*/ |
||||
class YqnExtraFieldsTest { |
||||
|
||||
private static final Clock CLOCK = Clock.fixed(Instant.parse("2026-11-11T00:00:00Z"), ZoneOffset.UTC); |
||||
|
||||
private static WarehouseContext ctx() { |
||||
return WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, "RF_NY_US", |
||||
WarehouseConnection.of(YqnConstants.PR_BASE_URL, |
||||
ChannelSecret.builder().appSecret("key-1").build()), |
||||
"req-extra", CLOCK); |
||||
} |
||||
|
||||
// ------------------------------------------------------------ 入库请求
|
||||
|
||||
private static InboundCommand inboundCommand() { |
||||
return InboundCommand.builder() |
||||
.inboundRequestNo("OMS-IN-1") |
||||
.inventoryType(0) |
||||
.lineName("项目A") |
||||
.shipmentId("FBA15ABC") |
||||
.referenceId("REF-1") |
||||
.transportType(0) |
||||
.deliveryType(1) |
||||
.containerSize(2) |
||||
.transportOrderNo("TMS-1") |
||||
.transportOrderNo("TMS-2") |
||||
.carrierCode(2) |
||||
.socContainer(true) |
||||
.palletized(false) |
||||
.attachment(WarehouseAttachment.builder() |
||||
.name("装箱单.pdf").type("PackingList").url("https://f/p.pdf").build()) |
||||
.line(common.ecommerce.warehouse.model.InboundLine.builder() |
||||
.omsSku("DM1").quantity(10).build()) |
||||
.build(); |
||||
} |
||||
|
||||
@Test |
||||
void inboundRequestSendsNewFields() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_INBOUND_CREATE, req -> Responses.ok( |
||||
"{\"code\":200,\"data\":{\"inboundPlanOrderNo\":\"IP1\"}}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).create(ctx(), inboundCommand()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(body.contains("\"lineCode\":\"项目A\""), body); |
||||
assertTrue(body.contains("\"shipmentId\":\"FBA15ABC\""), body); |
||||
assertTrue(body.contains("\"referenceId\":\"REF-1\""), body); |
||||
assertTrue(body.contains("\"transportType\":0"), body); |
||||
assertTrue(body.contains("\"deliveryType\":1"), body); |
||||
assertTrue(body.contains("\"goodsSize\":2"), body); |
||||
// 运去哪是逗号分割的字符串
|
||||
assertTrue(body.contains("\"tmsNos\":\"TMS-1,TMS-2\""), body); |
||||
assertTrue(body.contains("\"carrier\":2"), body); |
||||
assertTrue(body.contains("\"socFlag\":1"), body); |
||||
assertTrue(body.contains("\"palletFlag\":0"), body); |
||||
assertTrue(body.contains("\"attachInfoItems\""), body); |
||||
assertTrue(body.contains("\"type\":\"PackingList\""), body); |
||||
// openapi 只支持自发头程
|
||||
assertTrue(body.contains("\"logisticsType\":0"), body); |
||||
} |
||||
|
||||
// ------------------------------------------------------------ 入库响应
|
||||
|
||||
@Test |
||||
void inboundResponseMapsNewFields() { |
||||
String body = "{\"code\":\"200\",\"data\":{" |
||||
+ "\"orgWarehouseCode\":\"RF_NY_US\",\"inventoryType\":\"0\"," |
||||
+ "\"inboundPlanOrderNo\":\"IP1\",\"sourceNo\":\"S1\"," |
||||
+ "\"inboundPlanOrderStatus\":\"25\"," |
||||
+ "\"lineName\":\"项目A\",\"shipmentId\":\"FBA15ABC\"," |
||||
+ "\"referenceId\":\"REF-1\",\"shipmentNo\":\"1Z999\"," |
||||
+ "\"goodsType\":\"普货\",\"actualShipDate\":\"2026-11-12 10:00:00\"," |
||||
+ "\"cartonTotalWeight\":118.5,\"cartonTotalVolume\":1.75," |
||||
+ "\"gpQuantity20\":\"1\",\"gpCartonNo20\":\"GP-1\"," |
||||
+ "\"hqQuantity40\":\"2\",\"hqCartonNo40\":\"HQ-1\"}}"; |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_INBOUND_GET, req -> Responses.ok(body)); |
||||
|
||||
InboundOrder order = new YqnAdapter(transport, new JacksonJsonCodec()).get(ctx(), "S1"); |
||||
|
||||
assertEquals("项目A", order.lineName()); |
||||
assertEquals("FBA15ABC", order.shipmentId()); |
||||
assertEquals("REF-1", order.referenceId()); |
||||
assertEquals("1Z999", order.shipmentNo()); |
||||
assertEquals("普货", order.goodsType()); |
||||
assertEquals(Instant.parse("2026-11-12T10:00:00Z"), order.actualShippedAt()); |
||||
assertEquals(Double.valueOf(118.5), order.cartonTotalWeightKg()); |
||||
assertEquals(Double.valueOf(1.75), order.cartonTotalVolumeCbm()); |
||||
|
||||
// 只映射有值的柜型
|
||||
assertEquals(2, order.containers().size()); |
||||
assertEquals(InboundOrder.ContainerType.GP20, order.containers().get(0).type()); |
||||
assertEquals(Integer.valueOf(1), order.containers().get(0).quantity()); |
||||
assertEquals("GP-1", order.containers().get(0).containerNo()); |
||||
assertEquals(InboundOrder.ContainerType.HQ40, order.containers().get(1).type()); |
||||
assertEquals("gpQuantity20", order.containers().get(0).rawType()); |
||||
} |
||||
|
||||
/** 没有柜型信息时不产空对象。 */ |
||||
@Test |
||||
void noContainersWhenAbsent() { |
||||
String body = "{\"code\":\"200\",\"data\":{\"orgWarehouseCode\":\"W\"," |
||||
+ "\"inventoryType\":\"0\",\"inboundPlanOrderNo\":\"IP1\"," |
||||
+ "\"sourceNo\":\"S1\",\"inboundPlanOrderStatus\":\"0\"}}"; |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_INBOUND_GET, req -> Responses.ok(body)); |
||||
|
||||
assertTrue(new YqnAdapter(transport, new JacksonJsonCodec()) |
||||
.get(ctx(), "S1").containers().isEmpty()); |
||||
} |
||||
|
||||
// ------------------------------------------------------------ 商品
|
||||
|
||||
private static WarehouseProduct.Builder product() { |
||||
return WarehouseProduct.builder() |
||||
.omsSku("DM1").name("测试").nameEn("Test") |
||||
.packingType(1).lengthCm(10).widthCm(8).heightCm(6).weightGrams(500); |
||||
} |
||||
|
||||
@Test |
||||
void productSendsNewFields() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_PRODUCT_SAVE, req -> Responses.ok( |
||||
"{\"code\":200,\"message\":\"ok\"}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).createOrUpdate(ctx(), |
||||
product().expirationControl(true).expirationDays(365) |
||||
.packedQuantity(24).packedLengthCm(40.0).packedWeightGrams(1200.0) |
||||
.insured(true).insuranceFee(Money.of("2.50", "USD")) |
||||
.snManagementMode(1).lotControlEnabled(true) |
||||
.lotAttributeCode("ProductionDateNumber") |
||||
.build()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(body.contains("\"expirationControl\":1"), body); |
||||
assertTrue(body.contains("\"expirationDate\":365"), body); |
||||
assertTrue(body.contains("\"packedQty\":24"), body); |
||||
assertTrue(body.contains("\"packedLength\":40.0"), body); |
||||
assertTrue(body.contains("\"packedWeight\":1200.0"), body); |
||||
assertTrue(body.contains("\"isInsuranceFlag\":\"Y\""), body); |
||||
assertTrue(body.contains("\"isInsuranceRate\":2.5"), body); |
||||
assertTrue(body.contains("\"snMgmtMode\":1"), body); |
||||
assertTrue(body.contains("\"lotEnabled\":1"), body); |
||||
assertTrue(body.contains("ProductionDateNumber"), body); |
||||
} |
||||
|
||||
@Test |
||||
void productOmitsUnsetOptionalFields() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_PRODUCT_SAVE, req -> Responses.ok( |
||||
"{\"code\":200,\"message\":\"ok\"}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).createOrUpdate(ctx(), product().build()); |
||||
|
||||
String body = transport.lastDataRequest().body(); |
||||
assertTrue(!body.contains("expirationControl"), body); |
||||
assertTrue(!body.contains("lotControl"), body); |
||||
assertTrue(!body.contains("isInsuranceFlag"), body); |
||||
} |
||||
|
||||
/** 海关只接受 USD,非美元直接拒绝而不是贴错币种。 */ |
||||
@Test |
||||
void customsRejectsNonUsd() { |
||||
RecordingTransport transport = RecordingTransport.create(); |
||||
YqnAdapter adapter = new YqnAdapter(transport, new JacksonJsonCodec()); |
||||
|
||||
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class, |
||||
() -> adapter.createOrUpdate(ctx(), product() |
||||
.countryOfOrigin("US").hsCode("1234567890") |
||||
.declaredValue(Money.of("10.00", "CNY")) |
||||
.build())); |
||||
assertTrue(ex.getMessage().contains("USD"), ex.getMessage()); |
||||
} |
||||
|
||||
@Test |
||||
void customsAcceptsUsd() { |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route(YqnConstants.PATH_PRODUCT_SAVE, req -> Responses.ok( |
||||
"{\"code\":200,\"message\":\"ok\"}")); |
||||
new YqnAdapter(transport, new JacksonJsonCodec()).createOrUpdate(ctx(), product() |
||||
.countryOfOrigin("US").hsCode("1234567890") |
||||
.declaredValue(Money.of("10.00", "USD")).build()); |
||||
|
||||
assertTrue(transport.lastDataRequest().body().contains("\"importDeclaredCurrency\":\"USD\"")); |
||||
} |
||||
|
||||
// ------------------------------------------------------------ 轨迹
|
||||
|
||||
@Test |
||||
void trackingMapsParcelWithUnitConversion() { |
||||
String body = "{\"code\":1,\"message\":\"ok\",\"data\":{" |
||||
+ "\"trackingCode\":\"TRK1\",\"carrier\":\"FEDEX\",\"status\":\"DELIVERED\"," |
||||
+ "\"parcel\":{\"weight\":1.0,\"length\":10.0,\"width\":8.0,\"height\":6.0," |
||||
+ "\"weightUnits\":\"oz\",\"packageDimensionsUnits\":\"inch\"}," |
||||
+ "\"carrierDetail\":{\"service\":\"FedEx_Ground\"," |
||||
+ "\"guaranteedDeliveryDate\":\"2026-11-15\"," |
||||
+ "\"originLocation\":\"Newark,NJ\",\"destinationLocation\":\"NY,NY\"}}}"; |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK1", req -> Responses.ok(body)); |
||||
WarehouseContext trackingCtx = WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, |
||||
"RF_NY_US", WarehouseConnection.of(YqnConstants.PR_BASE_URL, |
||||
YqnConstants.AUX_BASE_URL_PR, ChannelSecret.builder().appSecret("k").build()), |
||||
"req-track", CLOCK); |
||||
|
||||
TrackingInfo info = new YqnAdapter(transport, new JacksonJsonCodec()) |
||||
.trackShipment(trackingCtx, "TRK1"); |
||||
|
||||
// oz → g:1 oz ≈ 28.3495 g
|
||||
assertEquals(28.349523125, info.parcelWeightGrams(), 0.000001); |
||||
// inch → cm:10 inch = 25.4 cm
|
||||
assertEquals(25.4, info.parcelLengthCm(), 0.000001); |
||||
assertEquals(20.32, info.parcelWidthCm(), 0.000001); |
||||
assertEquals(15.24, info.parcelHeightCm(), 0.000001); |
||||
assertEquals("2026-11-15", info.guaranteedDeliveryDate()); |
||||
assertEquals("Newark,NJ", info.originLocation()); |
||||
assertEquals("NY,NY", info.destinationLocation()); |
||||
} |
||||
|
||||
@Test |
||||
void trackingWithoutParcelIsSafe() { |
||||
String body = "{\"code\":1,\"data\":{\"trackingCode\":\"TRK1\",\"carrier\":\"FEDEX\"}}"; |
||||
RecordingTransport transport = RecordingTransport.create() |
||||
.route("/api/v2/orderShipment/track/TRK1", req -> Responses.ok(body)); |
||||
WarehouseContext trackingCtx = WarehouseContext.of("YQN-RF_NY_US", WarehouseProvider.YQN, |
||||
"RF_NY_US", WarehouseConnection.of(YqnConstants.PR_BASE_URL, |
||||
YqnConstants.AUX_BASE_URL_PR, ChannelSecret.builder().appSecret("k").build()), |
||||
"req-track", CLOCK); |
||||
|
||||
TrackingInfo info = new YqnAdapter(transport, new JacksonJsonCodec()) |
||||
.trackShipment(trackingCtx, "TRK1"); |
||||
|
||||
assertEquals(null, info.parcelWeightGrams()); |
||||
assertEquals(null, info.guaranteedDeliveryDate()); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue