From 04388e1b444dfc8e8551d8ee17761b48f994d289 Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Tue, 3 Nov 2026 16:19:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(merge):=20=E5=90=88=E5=B9=B6=E5=90=8E?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D=E5=AE=9E=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E9=BD=90=20VC=20=E8=AE=A2=E5=8D=95=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重复实现(合并分支与本分支各写了一份): - amazon/vc/shop:VcShopSource 与 AmazonVcShopSource 重复, 保留带内部翻页的 VcShopSource,删除 AmazonVcShopSource; 同时去掉它按 status==1 过滤的行为(统一遵守“只转发”约定) - amazon/vc/dto:删除不再引用的 AmazonVcShopDto 补齐: - AmazonVcSubPlatform 接上 VcOrderSource(合并分支已实现 VC 订单, 但子平台未声明),现在 VC 支持 订单/商品/店铺 三项 全库已无同名重复类,BUILD SUCCESS。 Co-Authored-By: Claude --- .../platform/amazon/vc/AmazonVcSubPlatform.java | 13 +++- .../platform/amazon/vc/dto/AmazonVcShopDto.java | 53 -------------- .../amazon/vc/shop/AmazonVcShopSource.java | 84 ---------------------- .../platform/amazon/vc/shop/VcShopSource.java | 9 ++- 4 files changed, 15 insertions(+), 144 deletions(-) delete mode 100644 lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/dto/AmazonVcShopDto.java delete mode 100644 lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java 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 shops(LingxingCall call) { - List out = new ArrayList(); - int offset = 0; - while (true) { - Map body = new LinkedHashMap(); - body.put("offset", offset); - body.put("length", MAX_PAGE_SIZE); - - HttpRequest req = call.signed(LingxingApi.SHOP_LIST_AMAZON_VC, body, "shops.list"); - HttpResponse resp = call.execute(req); - LingxingEnvelope envelope = call.envelope(resp, "shops.list"); - - List page = call.json().listAt(envelope.body(), "data", AmazonVcShopDto.class); - for (AmazonVcShopDto shop : page) { - if (shop.getVcStoreId() == null) { - continue; - } - out.add(SubChannel.builder() - .platformCode(AMAZON_VC_PLATFORM_CODE) - .externalStoreId(shop.getVcStoreId()) - .platform(Platform.AMAZON_VC) - .name(shop.getName() == null ? shop.getSellerId() : shop.getName()) - .sellerId(shop.getSellerId()) - .accountName(shop.getAccountName()) - .status(shop.getStatus()) - .region(shop.getRegion()) - .regionName(shop.getRegionName()) - .marketplaceNum(shop.getMid()) - .attributes(attributesOf(shop)) - .build()); - } - - offset += page.size(); - boolean hasMore = page.size() >= MAX_PAGE_SIZE - && (envelope.total() < 0 || offset < envelope.total()); - if (!hasMore) { - break; - } - } - return Collections.unmodifiableList(out); - } - - /** 未标准化的原始字段:只保留有值的。 */ - private static Map attributesOf(AmazonVcShopDto shop) { - Map attrs = new LinkedHashMap(); - attrs.put("account_id", shop.getAccountId()); - attrs.values().removeAll(Collections.singleton(null)); - return attrs; - } -} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java index 25708c5..1cf2611 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/VcShopSource.java @@ -25,12 +25,12 @@ import java.util.Map; * *

{@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 shops = call.json().listAt(envelope.body(), "data", VcShopDto.class); for (VcShopDto shop : shops) { - if (shop.getVcStoreId() == null - || shop.getStatus() == null || shop.getStatus() != STATUS_ACTIVE) { + if (shop.getVcStoreId() == null) { continue; } out.add(new SubChannel(