Browse Source

refactor(lingxing): 亚马逊 SC / VC 分包,补齐能力子目录

之前 SC 的文件直接放在 amazon/ 下、VC 混着 AmazonVc 前缀,层级不一致。
现在两边同构:

amazon/sc/
  AmazonScSubPlatform
  dto/AmazonScShopDto, AmazonScListingDto
  product/AmazonScProductSource
  shop/AmazonScShopSource
amazon/vc/
  AmazonVcSubPlatform
  dto/AmazonVcShopDto, AmazonVcListingDto
  product/AmazonVcProductSource
  shop/AmazonVcShopSource

类名统一加 Sc/Vc 前缀,避免同名 DTO 混淆。

Co-Authored-By: Claude <noreply@anthropic.com>
feature/supplier-lingxing
chenchuchuan 3 weeks ago
parent
commit
707ecd3e11
  1. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java
  2. 8
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/AmazonScSubPlatform.java
  3. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScListingDto.java
  4. 4
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonScShopDto.java
  5. 12
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/product/AmazonScProductSource.java
  6. 10
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/shop/AmazonScShopSource.java
  7. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcSubPlatform.java
  8. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
  9. 2
      lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/shop/AmazonVcShopSource.java

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java

@ -30,7 +30,7 @@ public final class LingxingSubPlatforms {
static { static {
Map<Platform, LingxingSubPlatform> map = new EnumMap<Platform, LingxingSubPlatform>(Platform.class); Map<Platform, LingxingSubPlatform> map = new EnumMap<Platform, LingxingSubPlatform>(Platform.class);
register(map, new WalmartSubPlatform(SHARED_TRANSPORT, SHARED_JSON)); 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)); SHARED_TRANSPORT, SHARED_JSON));
register(map, new common.ecommerce.lingxing.platform.amazon.vc.AmazonVcSubPlatform( register(map, new common.ecommerce.lingxing.platform.amazon.vc.AmazonVcSubPlatform(
SHARED_TRANSPORT, SHARED_JSON)); SHARED_TRANSPORT, SHARED_JSON));

8
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonScSubPlatform.java → 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.HttpTransport;
import common.ecommerce.http.JacksonJsonCodec; 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.order.LingxingOrderSource;
import common.ecommerce.lingxing.platform.product.LingxingProductSource; import common.ecommerce.lingxing.platform.product.LingxingProductSource;
import common.ecommerce.lingxing.platform.shop.LingxingShopSource; 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; import common.ecommerce.model.Platform;
/** /**
@ -17,8 +19,8 @@ public final class AmazonScSubPlatform implements LingxingSubPlatform {
private final LingxingShopSource shops; private final LingxingShopSource shops;
public AmazonScSubPlatform(HttpTransport transport, JacksonJsonCodec json) { public AmazonScSubPlatform(HttpTransport transport, JacksonJsonCodec json) {
this.products = new AmazonProductSource(); this.products = new AmazonScProductSource();
this.shops = new AmazonShopSource(); this.shops = new AmazonScShopSource();
} }
@Override @Override

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonListingDto.java → 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.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -17,7 +17,7 @@ import lombok.Setter;
@Getter @Getter
@Setter @Setter
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class AmazonListingDto { public class AmazonScListingDto {
/** 店铺 id。 */ /** 店铺 id。 */
@JsonProperty("sid") @JsonProperty("sid")

4
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/AmazonShopDto.java → 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.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -13,7 +13,7 @@ import lombok.Setter;
@Getter @Getter
@Setter @Setter
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class AmazonShopDto { public class AmazonScShopDto {
/** 店铺 id,领星 ERP 对企业已授权店铺的唯一标识。 */ /** 店铺 id,领星 ERP 对企业已授权店铺的唯一标识。 */
@JsonProperty("sid") @JsonProperty("sid")

12
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonProductSource.java → 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.HttpRequest;
import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall; 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.lingxing.platform.product.LingxingProductSource;
import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.ChannelProvider;
import common.ecommerce.model.product.ProductListing; import common.ecommerce.model.product.ProductListing;
@ -31,7 +31,7 @@ import java.util.Map;
* <p>接口 {@code /erp/sc/data/mws/listing}:POST,{@code offset}/{@code length} 分页, * <p>接口 {@code /erp/sc/data/mws/listing}:POST,{@code offset}/{@code length} 分页,
* {@code length} 上限 1000;令牌桶容量 1,且按「账户 + path」共享,必须串行调用。</p> * {@code length} 上限 1000;令牌桶容量 1,且按「账户 + path」共享,必须串行调用。</p>
*/ */
public final class AmazonProductSource implements LingxingProductSource { public final class AmazonScProductSource implements LingxingProductSource {
private static final int MAX_PAGE_SIZE = 1000; private static final int MAX_PAGE_SIZE = 1000;
@ -64,9 +64,9 @@ public final class AmazonProductSource implements LingxingProductSource {
HttpResponse resp = call.execute(req); HttpResponse resp = call.execute(req);
LingxingEnvelope envelope = call.envelope(resp, "products.pull"); LingxingEnvelope envelope = call.envelope(resp, "products.pull");
List<AmazonListingDto> dtos = call.json().listAt(envelope.body(), "data", AmazonListingDto.class); List<AmazonScListingDto> dtos = call.json().listAt(envelope.body(), "data", AmazonScListingDto.class);
List<ProductListing> out = new ArrayList<ProductListing>(dtos.size()); List<ProductListing> out = new ArrayList<ProductListing>(dtos.size());
for (AmazonListingDto dto : dtos) { for (AmazonScListingDto dto : dtos) {
out.add(toProductListing(dto, call)); out.add(toProductListing(dto, call));
} }
@ -76,7 +76,7 @@ public final class AmazonProductSource implements LingxingProductSource {
return Page.of(out, hasMore ? String.valueOf(nextOffset) : null); return Page.of(out, hasMore ? String.valueOf(nextOffset) : null);
} }
private ProductListing toProductListing(AmazonListingDto dto, LingxingCall call) { private ProductListing toProductListing(AmazonScListingDto dto, LingxingCall call) {
List<String> images = dto.getSmallImageUrl() == null List<String> images = dto.getSmallImageUrl() == null
? Collections.<String>emptyList() ? Collections.<String>emptyList()
: Collections.singletonList(dto.getSmallImageUrl()); : Collections.singletonList(dto.getSmallImageUrl());

10
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java → 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.capability.AggregatorCapable.SubChannel;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
@ -6,7 +6,7 @@ import common.ecommerce.http.HttpResponse;
import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.LingxingApi;
import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.http.LingxingEnvelope;
import common.ecommerce.lingxing.platform.LingxingCall; 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.lingxing.platform.shop.LingxingShopSource;
import common.ecommerce.model.Platform; import common.ecommerce.model.Platform;
@ -20,7 +20,7 @@ import java.util.List;
* <p>接口 {@code /erp/sc/data/seller/lists} 是 GET、非分页,一次返回企业下全部已授权 SC 店铺。 * <p>接口 {@code /erp/sc/data/seller/lists} 是 GET、非分页,一次返回企业下全部已授权 SC 店铺。
* 令牌桶容量 1,按「账户 + path」限流。</p> * 令牌桶容量 1,按「账户 + path」限流。</p>
*/ */
public final class AmazonShopSource implements LingxingShopSource { public final class AmazonScShopSource implements LingxingShopSource {
/** 领星侧 Amazon SC 的 platform_code。 */ /** 领星侧 Amazon SC 的 platform_code。 */
private static final int AMAZON_SC_PLATFORM_CODE = 10001; private static final int AMAZON_SC_PLATFORM_CODE = 10001;
@ -34,9 +34,9 @@ public final class AmazonShopSource implements LingxingShopSource {
HttpResponse resp = call.execute(req); HttpResponse resp = call.execute(req);
LingxingEnvelope envelope = call.envelope(resp, "shops.list"); LingxingEnvelope envelope = call.envelope(resp, "shops.list");
List<AmazonShopDto> shops = call.json().listAt(envelope.body(), "data", AmazonShopDto.class); List<AmazonScShopDto> shops = call.json().listAt(envelope.body(), "data", AmazonScShopDto.class);
List<SubChannel> out = new ArrayList<SubChannel>(shops.size()); List<SubChannel> out = new ArrayList<SubChannel>(shops.size());
for (AmazonShopDto shop : shops) { for (AmazonScShopDto shop : shops) {
if (shop.getSid() == null || shop.getStatus() == null || shop.getStatus() != STATUS_ACTIVE) { if (shop.getSid() == null || shop.getStatus() == null || shop.getStatus() != STATUS_ACTIVE) {
continue; continue;
} }

2
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.LingxingSubPlatform;
import common.ecommerce.lingxing.platform.product.LingxingProductSource; import common.ecommerce.lingxing.platform.product.LingxingProductSource;
import common.ecommerce.lingxing.platform.shop.LingxingShopSource; 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; import common.ecommerce.model.Platform;
/** /**

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcProductSource.java → 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.HttpRequest;
import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpResponse;

2
lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/AmazonVcShopSource.java → 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.capability.AggregatorCapable.SubChannel;
import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpRequest;
Loading…
Cancel
Save