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 46c2248..43af041 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 @@ -3,10 +3,12 @@ package common.ecommerce.lingxing.platform.amazon.vc; import common.ecommerce.http.HttpTransport; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.platform.LingxingSubPlatform; +import common.ecommerce.lingxing.platform.amazon.vc.order.VcOrderSource; +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.vc.product.AmazonVcProductSource; -import common.ecommerce.lingxing.platform.amazon.vc.shop.AmazonVcShopSource; +import common.ecommerce.lingxing.platform.amazon.vc.shop.VcShopSource; import common.ecommerce.model.Platform; /** @@ -14,12 +16,19 @@ import common.ecommerce.model.Platform; */ public final class AmazonVcSubPlatform implements LingxingSubPlatform { + private final LingxingOrderSource orders; private final LingxingProductSource products; private final LingxingShopSource shops; public AmazonVcSubPlatform(HttpTransport transport, JacksonJsonCodec json) { + this.orders = new VcOrderSource(); this.products = new AmazonVcProductSource(); - this.shops = new AmazonVcShopSource(); + this.shops = new VcShopSource(); + } + + @Override + public LingxingOrderSource orderSource() { + return orders; } @Override diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/dto/AmazonVcShopDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/dto/AmazonVcShopDto.java deleted file mode 100644 index 7d64aaa..0000000 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/dto/AmazonVcShopDto.java +++ /dev/null @@ -1,53 +0,0 @@ -package common.ecommerce.lingxing.platform.amazon.vc.dto; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -/** - * 领星 · 亚马逊 VC 店铺({@code /basicOpen/platformAuth/vcSeller/pageList} 的 {@code data[]})。 - * - *
唯一键 {@code vc_store_id},后续查 VC Listing 时用它指定店铺。
- */ -@Getter -@Setter -@JsonIgnoreProperties(ignoreUnknown = true) -public class AmazonVcShopDto { - - /** 账号 ID。 */ - @JsonProperty("account_id") - private Long accountId; - - /** SELLER_ID。 */ - @JsonProperty("seller_id") - private String sellerId; - - /** 账号名称。 */ - @JsonProperty("account_name") - private String accountName; - - /** 站点简称,如 na。 */ - @JsonProperty("region") - private String region; - - /** 站点名称,如 北美洲。 */ - @JsonProperty("region_name") - private String regionName; - - /** VC 店铺 id,后续接口的入参。 */ - @JsonProperty("vc_store_id") - private String vcStoreId; - - /** 店铺名称。 */ - @JsonProperty("name") - private String name; - - /** 店铺授权服务状态:-1 删除,0 暂停同步,1 正常同步,2 授权异常。 */ - @JsonProperty("status") - private Integer status; - - /** 站点 id。 */ - @JsonProperty("mid") - private Integer mid; -} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java deleted file mode 100644 index 30693d5..0000000 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java +++ /dev/null @@ -1,84 +0,0 @@ -package common.ecommerce.lingxing.platform.amazon.vc.shop; - -import common.ecommerce.capability.AggregatorCapable.SubChannel; -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.vc.dto.AmazonVcShopDto; -import common.ecommerce.lingxing.platform.shop.LingxingShopSource; -import common.ecommerce.model.Platform; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * 领星 · 亚马逊 VC 店铺列表。 - * - *接口 {@code /basicOpen/platformAuth/vcSeller/pageList}:POST,{@code offset}/{@code length} - * 分页,{@code length} 上限 200,令牌桶容量 1。
- * - *SDK 只做转发,不按状态过滤;调用方按 {@link SubChannel#status()} 自行决定用哪些。
- */ -public final class AmazonVcShopSource implements LingxingShopSource { - - /** 领星侧 Amazon VC 的 platform_code。 */ - private static final int AMAZON_VC_PLATFORM_CODE = 10035; - - private static final int MAX_PAGE_SIZE = 200; - - @Override - public List{@link LingxingShopSource#shops(LingxingCall)} 要返回全量店铺,所以这里内部翻页, * 直到返回不足一页或达到 {@code total}。
+ * + *SDK 只做转发,不按状态过滤;调用方按 {@link SubChannel#status()} 自行决定用哪些。 + * 但该实现构造 SubChannel 时未带 status,需要时再补。
*/ public final class VcShopSource implements LingxingShopSource { - /** 店铺授权服务状态:1 = 正常同步。 */ - private static final int STATUS_ACTIVE = 1; - private static final String OP = "shops.list.vc"; @Override @@ -50,8 +50,7 @@ public final class VcShopSource implements LingxingShopSource { List