贴标申请,仓储转运
This commit is contained in:
@@ -33,7 +33,7 @@ public class FbaWarehouseValidator {
|
||||
|| !"FBA".equals(warehouse.warehouseType())
|
||||
|| !"ACTIVE".equals(warehouse.status())
|
||||
|| !same(requestedCode, warehouse.warehouseCode())
|
||||
|| !same(requestedName, warehouse.warehouseName())) {
|
||||
|| !sameIfProvided(requestedName, warehouse.warehouseName())) {
|
||||
throw invalid();
|
||||
}
|
||||
String region = firstRegion(response.data().addresses());
|
||||
@@ -69,6 +69,10 @@ public class FbaWarehouseValidator {
|
||||
&& requested.trim().equals(actual.trim());
|
||||
}
|
||||
|
||||
private boolean sameIfProvided(String requested, String actual) {
|
||||
return !StringUtils.hasText(requested) || same(requested, actual);
|
||||
}
|
||||
|
||||
private String firstRegion(List<DomesticWarehouseDirectoryClient.Address> addresses) {
|
||||
if (addresses == null) return null;
|
||||
return addresses.stream().filter(Objects::nonNull)
|
||||
|
||||
Reference in New Issue
Block a user