diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java index 012bfea..826049c 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java @@ -30,7 +30,7 @@ public final class LingxingSubPlatforms { static { Map map = new EnumMap(Platform.class); register(map, new WalmartSubPlatform(SHARED_TRANSPORT, SHARED_JSON)); - register(map, new common.ecommerce.lingxing.platform.amazon.AmazonScSubPlatform( + register(map, new common.ecommerce.lingxing.platform.amazon.sc.AmazonScSubPlatform( SHARED_TRANSPORT, SHARED_JSON)); register(map, new common.ecommerce.lingxing.platform.amazon.vc.AmazonVcSubPlatform( SHARED_TRANSPORT, SHARED_JSON)); diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonScSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java similarity index 79% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonScSubPlatform.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java index b0ac6ca..2d3441a 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonScSubPlatform.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon; +package common.ecommerce.lingxing.platform.amazon.sc; import common.ecommerce.http.HttpTransport; import common.ecommerce.http.JacksonJsonCodec; @@ -6,6 +6,8 @@ import common.ecommerce.lingxing.platform.LingxingSubPlatform; import common.ecommerce.lingxing.platform.order.LingxingOrderSource; import common.ecommerce.lingxing.platform.product.LingxingProductSource; import common.ecommerce.lingxing.platform.shop.LingxingShopSource; +import common.ecommerce.lingxing.platform.amazon.sc.product.AmazonScProductSource; +import common.ecommerce.lingxing.platform.amazon.sc.shop.AmazonScShopSource; import common.ecommerce.model.Platform; /** @@ -17,8 +19,8 @@ public final class AmazonScSubPlatform implements LingxingSubPlatform { private final LingxingShopSource shops; public AmazonScSubPlatform(HttpTransport transport, JacksonJsonCodec json) { - this.products = new AmazonProductSource(); - this.shops = new AmazonShopSource(); + this.products = new AmazonScProductSource(); + this.shops = new AmazonScShopSource(); } @Override diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonListingDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScListingDto.java similarity index 95% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonListingDto.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScListingDto.java index 47ec7e6..8cbebff 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonListingDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScListingDto.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon.dto; +package common.ecommerce.lingxing.platform.amazon.sc.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,7 +17,7 @@ import lombok.Setter; @Getter @Setter @JsonIgnoreProperties(ignoreUnknown = true) -public class AmazonListingDto { +public class AmazonScListingDto { /** 店铺 id。 */ @JsonProperty("sid") diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonShopDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScShopDto.java similarity index 94% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonShopDto.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScShopDto.java index 2858f02..3c57149 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonShopDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScShopDto.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon.dto; +package common.ecommerce.lingxing.platform.amazon.sc.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -13,7 +13,7 @@ import lombok.Setter; @Getter @Setter @JsonIgnoreProperties(ignoreUnknown = true) -public class AmazonShopDto { +public class AmazonScShopDto { /** 店铺 id,领星 ERP 对企业已授权店铺的唯一标识。 */ @JsonProperty("sid") diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java similarity index 90% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonProductSource.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java index 075620a..470e120 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonProductSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java @@ -1,11 +1,11 @@ -package common.ecommerce.lingxing.platform.amazon; +package common.ecommerce.lingxing.platform.amazon.sc.product; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonListingDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonScListingDto; import common.ecommerce.lingxing.platform.product.LingxingProductSource; import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.product.ProductListing; @@ -31,7 +31,7 @@ import java.util.Map; *

接口 {@code /erp/sc/data/mws/listing}:POST,{@code offset}/{@code length} 分页, * {@code length} 上限 1000;令牌桶容量 1,且按「账户 + path」共享,必须串行调用。

*/ -public final class AmazonProductSource implements LingxingProductSource { +public final class AmazonScProductSource implements LingxingProductSource { private static final int MAX_PAGE_SIZE = 1000; @@ -64,9 +64,9 @@ public final class AmazonProductSource implements LingxingProductSource { HttpResponse resp = call.execute(req); LingxingEnvelope envelope = call.envelope(resp, "products.pull"); - List dtos = call.json().listAt(envelope.body(), "data", AmazonListingDto.class); + List dtos = call.json().listAt(envelope.body(), "data", AmazonScListingDto.class); List out = new ArrayList(dtos.size()); - for (AmazonListingDto dto : dtos) { + for (AmazonScListingDto dto : dtos) { out.add(toProductListing(dto, call)); } @@ -76,7 +76,7 @@ public final class AmazonProductSource implements LingxingProductSource { return Page.of(out, hasMore ? String.valueOf(nextOffset) : null); } - private ProductListing toProductListing(AmazonListingDto dto, LingxingCall call) { + private ProductListing toProductListing(AmazonScListingDto dto, LingxingCall call) { List images = dto.getSmallImageUrl() == null ? Collections.emptyList() : Collections.singletonList(dto.getSmallImageUrl()); diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java similarity index 84% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java index e919a26..2b30459 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon; +package common.ecommerce.lingxing.platform.amazon.sc.shop; import common.ecommerce.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; @@ -6,7 +6,7 @@ import common.ecommerce.http.HttpResponse; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonShopDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonScShopDto; import common.ecommerce.lingxing.platform.shop.LingxingShopSource; import common.ecommerce.model.Platform; @@ -20,7 +20,7 @@ import java.util.List; *

接口 {@code /erp/sc/data/seller/lists} 是 GET、非分页,一次返回企业下全部已授权 SC 店铺。 * 令牌桶容量 1,按「账户 + path」限流。

*/ -public final class AmazonShopSource implements LingxingShopSource { +public final class AmazonScShopSource implements LingxingShopSource { /** 领星侧 Amazon SC 的 platform_code。 */ private static final int AMAZON_SC_PLATFORM_CODE = 10001; @@ -34,9 +34,9 @@ public final class AmazonShopSource implements LingxingShopSource { HttpResponse resp = call.execute(req); LingxingEnvelope envelope = call.envelope(resp, "shops.list"); - List shops = call.json().listAt(envelope.body(), "data", AmazonShopDto.class); + List shops = call.json().listAt(envelope.body(), "data", AmazonScShopDto.class); List out = new ArrayList(shops.size()); - for (AmazonShopDto shop : shops) { + for (AmazonScShopDto shop : shops) { if (shop.getSid() == null || shop.getStatus() == null || shop.getStatus() != STATUS_ACTIVE) { continue; } diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java index 37d899f..46c2248 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java @@ -5,6 +5,8 @@ import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.platform.LingxingSubPlatform; import common.ecommerce.lingxing.platform.product.LingxingProductSource; import common.ecommerce.lingxing.platform.shop.LingxingShopSource; +import common.ecommerce.lingxing.platform.amazon.vc.product.AmazonVcProductSource; +import common.ecommerce.lingxing.platform.amazon.vc.shop.AmazonVcShopSource; import common.ecommerce.model.Platform; /** diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java similarity index 98% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcProductSource.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java index 32607fc..3c031b8 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcProductSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon.vc; +package common.ecommerce.lingxing.platform.amazon.vc.product; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java similarity index 97% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcShopSource.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java index c2023f9..771dcfd 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcShopSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing.platform.amazon.vc; +package common.ecommerce.lingxing.platform.amazon.vc.shop; import common.ecommerce.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest;