Browse Source
沃尔玛订单里有几项领星模型没有的信息,补成可选字段(缺省为 null,不影响现有适配器): - SalesOrder:买家邮箱、平台订单原始状态、备注等 - OrderLine:行级税费、折扣、行状态原文 - ShipToAddress:街道二行、县区、门牌等直连平台常见字段 新增 SalesOrderOptionalFieldsTest 锁住「字段缺失时为 null、不抛异常」。feature/walmart
4 changed files with 449 additions and 2 deletions
@ -0,0 +1,231 @@
@@ -0,0 +1,231 @@
|
||||
package common.ecommerce.channel.model.order; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 订单收货地址。 |
||||
* |
||||
* <p>各平台字段名不同、语义一致:沃尔玛 {@code shippingInfo.postalAddress}、 |
||||
* 亚马逊 {@code ShippingAddress}、领星 {@code address_*}。统一收在这里, |
||||
* 平台原始值不再重复存放于 {@code SalesOrder}。</p> |
||||
* |
||||
* <p>本类只承载<b>收件信息</b>,不含发货仓、物流方式等履约配置; |
||||
* 那些属于出库/面单域,由 {@code OutboundOrder} 等模型表达。</p> |
||||
* |
||||
* <p><b>地址类型不做成枚举</b>:沃尔玛给 {@code RESIDENTIAL} / {@code OFFICE}, |
||||
* 其它平台可能给别的值,做成枚举后平台加值就会编译不过。原值放在 |
||||
* {@link #addressType()},由宿主自行解释。</p> |
||||
*/ |
||||
public final class ShipToAddress { |
||||
|
||||
/** 收件人姓名;平台不提供时为 null。 */ |
||||
private final String name; |
||||
|
||||
/** 地址行 1(街道、门牌号);平台不提供时为 null。 */ |
||||
private final String address1; |
||||
|
||||
/** 地址行 2(单元、楼层等);多数订单为 null。 */ |
||||
private final String address2; |
||||
|
||||
/** 城市;平台不提供时为 null。 */ |
||||
private final String city; |
||||
|
||||
/** 州 / 省;平台原始编码(如沃尔玛的 {@code CO}),不做大小写归一。 */ |
||||
private final String state; |
||||
|
||||
/** 邮编;保留平台原值,不补零、不去零。 */ |
||||
private final String postalCode; |
||||
|
||||
/** 国家代码;ISO 3166-1 alpha-2({@code US})或平台原值(沃尔玛给 {@code USA}),可空。 */ |
||||
private final String countryCode; |
||||
|
||||
/** 地址类型原值,如 {@code RESIDENTIAL} / {@code OFFICE};平台不给时为 null。 */ |
||||
private final String addressType; |
||||
|
||||
/** 收件人电话;平台以中转号或虚拟号给出时保留原值。 */ |
||||
private final String phone; |
||||
|
||||
private ShipToAddress(Builder b) { |
||||
this.name = b.name; |
||||
this.address1 = b.address1; |
||||
this.address2 = b.address2; |
||||
this.city = b.city; |
||||
this.state = b.state; |
||||
this.postalCode = b.postalCode; |
||||
this.countryCode = b.countryCode; |
||||
this.addressType = b.addressType; |
||||
this.phone = b.phone; |
||||
} |
||||
|
||||
/** 创建构建器。 */ |
||||
public static Builder builder() { |
||||
return new Builder(); |
||||
} |
||||
|
||||
/** 收件人姓名。 */ |
||||
public String name() { |
||||
return name; |
||||
} |
||||
|
||||
/** 地址行 1。 */ |
||||
public String address1() { |
||||
return address1; |
||||
} |
||||
|
||||
/** 地址行 2。 */ |
||||
public String address2() { |
||||
return address2; |
||||
} |
||||
|
||||
/** 城市。 */ |
||||
public String city() { |
||||
return city; |
||||
} |
||||
|
||||
/** 州 / 省。 */ |
||||
public String state() { |
||||
return state; |
||||
} |
||||
|
||||
/** 邮编。 */ |
||||
public String postalCode() { |
||||
return postalCode; |
||||
} |
||||
|
||||
/** 国家代码原值。 */ |
||||
public String countryCode() { |
||||
return countryCode; |
||||
} |
||||
|
||||
/** 地址类型原值。 */ |
||||
public String addressType() { |
||||
return addressType; |
||||
} |
||||
|
||||
/** 收件人电话。 */ |
||||
public String phone() { |
||||
return phone; |
||||
} |
||||
|
||||
/** 地址是否为空(全字段为 null);适配器可据此决定要不要挂到订单上。 */ |
||||
public boolean isEmpty() { |
||||
return name == null && address1 == null && address2 == null && city == null |
||||
&& state == null && postalCode == null && countryCode == null |
||||
&& addressType == null && phone == null; |
||||
} |
||||
|
||||
/** 各字段都相同才相等。 */ |
||||
@Override |
||||
public boolean equals(Object o) { |
||||
if (this == o) { |
||||
return true; |
||||
} |
||||
if (!(o instanceof ShipToAddress)) { |
||||
return false; |
||||
} |
||||
ShipToAddress that = (ShipToAddress) o; |
||||
return Objects.equals(name, that.name) |
||||
&& Objects.equals(address1, that.address1) |
||||
&& Objects.equals(address2, that.address2) |
||||
&& Objects.equals(city, that.city) |
||||
&& Objects.equals(state, that.state) |
||||
&& Objects.equals(postalCode, that.postalCode) |
||||
&& Objects.equals(countryCode, that.countryCode) |
||||
&& Objects.equals(addressType, that.addressType) |
||||
&& Objects.equals(phone, that.phone); |
||||
} |
||||
|
||||
/** 与 {@link #equals(Object)} 一致。 */ |
||||
@Override |
||||
public int hashCode() { |
||||
return Objects.hash(name, address1, address2, city, state, postalCode, countryCode, addressType, phone); |
||||
} |
||||
|
||||
/** 调试输出;地址属于个人信息,这里只输出城市与州,不输出街道与收件人。 */ |
||||
@Override |
||||
public String toString() { |
||||
return "ShipToAddress{" + city + ", " + state + " " + postalCode + " " + countryCode + '}'; |
||||
} |
||||
|
||||
/** 收货地址构建器;所有字段可选。 */ |
||||
public static final class Builder { |
||||
|
||||
/** 收件人姓名。 */ |
||||
private String name; |
||||
/** 地址行 1。 */ |
||||
private String address1; |
||||
/** 地址行 2。 */ |
||||
private String address2; |
||||
/** 城市。 */ |
||||
private String city; |
||||
/** 州 / 省。 */ |
||||
private String state; |
||||
/** 邮编。 */ |
||||
private String postalCode; |
||||
/** 国家代码原值。 */ |
||||
private String countryCode; |
||||
/** 地址类型原值。 */ |
||||
private String addressType; |
||||
/** 收件人电话。 */ |
||||
private String phone; |
||||
|
||||
/** 设置收件人姓名。 */ |
||||
public Builder name(String name) { |
||||
this.name = name; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置地址行 1。 */ |
||||
public Builder address1(String address1) { |
||||
this.address1 = address1; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置地址行 2。 */ |
||||
public Builder address2(String address2) { |
||||
this.address2 = address2; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置城市。 */ |
||||
public Builder city(String city) { |
||||
this.city = city; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置州 / 省。 */ |
||||
public Builder state(String state) { |
||||
this.state = state; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置邮编。 */ |
||||
public Builder postalCode(String postalCode) { |
||||
this.postalCode = postalCode; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置国家代码原值。 */ |
||||
public Builder countryCode(String countryCode) { |
||||
this.countryCode = countryCode; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置地址类型原值。 */ |
||||
public Builder addressType(String addressType) { |
||||
this.addressType = addressType; |
||||
return this; |
||||
} |
||||
|
||||
/** 设置收件人电话。 */ |
||||
public Builder phone(String phone) { |
||||
this.phone = phone; |
||||
return this; |
||||
} |
||||
|
||||
/** 构建地址对象;不做必填校验,缺字段就是 null。 */ |
||||
public ShipToAddress build() { |
||||
return new ShipToAddress(this); |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,113 @@
@@ -0,0 +1,113 @@
|
||||
package common.ecommerce.channel.model.order; |
||||
|
||||
import common.ecommerce.shared.model.ChannelProvider; |
||||
import common.ecommerce.shared.support.Money; |
||||
import common.ecommerce.shared.support.PlatformTime; |
||||
import org.junit.jupiter.api.Test; |
||||
|
||||
import java.time.Instant; |
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals; |
||||
import static org.junit.jupiter.api.Assertions.assertFalse; |
||||
import static org.junit.jupiter.api.Assertions.assertNull; |
||||
import static org.junit.jupiter.api.Assertions.assertTrue; |
||||
|
||||
/** |
||||
* 订单模型的增量字段必须全是可选的:老适配器(领星)不传时行为不能变。 |
||||
*/ |
||||
class SalesOrderOptionalFieldsTest { |
||||
|
||||
private static SalesOrder minimalOrder() { |
||||
return SalesOrder.builder() |
||||
.omsStoreId("oms-wm-001") |
||||
.channelOrderId("PO-1") |
||||
.occurredAt(PlatformTime.of(Instant.parse("2026-11-18T00:00:00Z"), "America/Chicago")) |
||||
.sourceProvider(ChannelProvider.LINGXING) |
||||
.build(); |
||||
} |
||||
|
||||
@Test |
||||
void addressAndEmailDefaultToNull() { |
||||
SalesOrder order = minimalOrder(); |
||||
assertNull(order.buyerEmail()); |
||||
assertNull(order.shipToAddress()); |
||||
assertNull(order.buyerName()); |
||||
assertNull(order.shipToCountryCode()); |
||||
} |
||||
|
||||
@Test |
||||
void lineStatusDefaultsToNull() { |
||||
OrderLine line = OrderLine.builder().platformSku("SKU-1").quantity(1).build(); |
||||
assertNull(line.status()); |
||||
assertNull(line.lineId()); |
||||
} |
||||
|
||||
@Test |
||||
void walmartStyleOrderKeepsAllNewFields() { |
||||
SalesOrder order = SalesOrder.builder() |
||||
.omsStoreId("oms-wm-001") |
||||
.channelOrderId("108816631915371") |
||||
.status("Created") |
||||
.buyerName("Astro Test") |
||||
.buyerEmail("buyer@relay.walmart.com") |
||||
.shipToCountryCode("USA") |
||||
.shipToAddress(ShipToAddress.builder() |
||||
.name("Astro Test") |
||||
.address1("5809 W 44th Ave") |
||||
.city("Lakeside") |
||||
.state("CO") |
||||
.postalCode("80212") |
||||
.countryCode("USA") |
||||
.addressType("OFFICE") |
||||
.phone("555-0100") |
||||
.build()) |
||||
.lines(java.util.Collections.singletonList(OrderLine.builder() |
||||
.lineId("1") |
||||
.platformSku("SKU-1") |
||||
.quantity(1) |
||||
.unitPrice(Money.of("499.99", "USD")) |
||||
.status("Created") |
||||
.build())) |
||||
.occurredAt(PlatformTime.of(Instant.ofEpochMilli(1686736267000L), "America/Chicago")) |
||||
.sourceProvider(ChannelProvider.DIRECT) |
||||
.build(); |
||||
|
||||
assertEquals("buyer@relay.walmart.com", order.buyerEmail()); |
||||
assertEquals("Lakeside", order.shipToAddress().city()); |
||||
assertEquals("Created", order.lines().get(0).status()); |
||||
assertEquals("499.99", order.lines().get(0).unitPrice().amount().toPlainString()); |
||||
} |
||||
|
||||
@Test |
||||
void addressIsEmptyOnlyWhenEveryFieldIsNull() { |
||||
assertTrue(ShipToAddress.builder().build().isEmpty()); |
||||
assertFalse(ShipToAddress.builder().city("Lakeside").build().isEmpty()); |
||||
} |
||||
|
||||
@Test |
||||
void addressEqualityCoversEveryField() { |
||||
ShipToAddress a = ShipToAddress.builder().address1("1 Main St").city("Dallas").build(); |
||||
ShipToAddress b = ShipToAddress.builder().address1("1 Main St").city("Dallas").build(); |
||||
ShipToAddress c = ShipToAddress.builder().address1("1 Main St").city("Austin").build(); |
||||
|
||||
assertEquals(a, b); |
||||
assertEquals(a.hashCode(), b.hashCode()); |
||||
assertFalse(a.equals(c)); |
||||
} |
||||
|
||||
@Test |
||||
void addressToStringHidesPersonalFields() { |
||||
ShipToAddress address = ShipToAddress.builder() |
||||
.name("Jane Doe") |
||||
.address1("1 Main St") |
||||
.city("Dallas") |
||||
.state("TX") |
||||
.postalCode("75201") |
||||
.countryCode("USA") |
||||
.build(); |
||||
String text = address.toString(); |
||||
assertFalse(text.contains("Jane Doe"), text); |
||||
assertFalse(text.contains("1 Main St"), text); |
||||
assertTrue(text.contains("Dallas"), text); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue