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 9a64565..059cbd6 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingSubPlatforms.java @@ -3,8 +3,8 @@ package common.ecommerce.lingxing.platform; import common.ecommerce.error.ChannelException; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.OkHttpTransport; -import common.ecommerce.lingxing.platform.amazon.AmazonScSubPlatform; -import common.ecommerce.lingxing.platform.amazon.AmazonVcSubPlatform; +import common.ecommerce.lingxing.platform.amazon.sc.AmazonScSubPlatform; +import common.ecommerce.lingxing.platform.amazon.vc.AmazonVcSubPlatform; import common.ecommerce.model.Platform; import common.ecommerce.lingxing.platform.walmart.WalmartSubPlatform; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonShopSource.java deleted file mode 100644 index e69de29..0000000 diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonVcSubPlatform.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonVcSubPlatform.java deleted file mode 100644 index a4eadbc..0000000 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/AmazonVcSubPlatform.java +++ /dev/null @@ -1,42 +0,0 @@ -package common.ecommerce.lingxing.platform.amazon; - -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.amazon.vc.shop.VcShopSource; -import common.ecommerce.lingxing.platform.order.LingxingOrderSource; -import common.ecommerce.lingxing.platform.shop.LingxingShopSource; -import common.ecommerce.model.Platform; - -/** - * 领星 · 亚马逊 VC 子平台:店铺与订单,只做能力组合。 - * - *

VC 目前没有商品与结算接口;能力由 Source 是否装配决定, - * 未装配的能力不会被声明。

- */ -public final class AmazonVcSubPlatform implements LingxingSubPlatform { - - private final LingxingOrderSource orders; - private final LingxingShopSource shops; - - public AmazonVcSubPlatform(HttpTransport transport, JacksonJsonCodec json) { - this.orders = new VcOrderSource(); - this.shops = new VcShopSource(); - } - - @Override - public Platform platform() { - return Platform.AMAZON_VC; - } - - @Override - public LingxingOrderSource orderSource() { - return orders; - } - - @Override - public LingxingShopSource shopSource() { - return shops; - } -} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/FbmOrderDto.java similarity index 100% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDto.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/FbmOrderDto.java diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderItemDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/FbmOrderItemDto.java similarity index 100% rename from lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderItemDto.java rename to lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/dto/FbmOrderItemDto.java diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java index ba27ca7..bc978d6 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSource.java @@ -11,7 +11,7 @@ import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.mapper.LingxingOrderMapper; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderDetailDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.FbmOrderDetailDto; import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderDto; import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderItemDto; import common.ecommerce.lingxing.platform.order.LingxingOrderSource; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java index 40930c3..d73f2da 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/order/AmazonOrderSource.java @@ -9,10 +9,10 @@ import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.mapper.LingxingOrderMapper; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonOrderDetailDto; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonOrderDetailItemDto; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonOrderDto; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonOrderItemDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderDetailDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderDetailItemDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonOrderItemDto; import common.ecommerce.lingxing.platform.order.LingxingOrderSource; import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.account.ChannelAccount; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailDto.java index e69de29..c9ae165 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailDto.java @@ -0,0 +1,77 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 领星 · 亚马逊 SC 订单详情({@code /erp/sc/data/mws/orderDetail} 的 {@code data[]})。 + * + *

与列表的差异:

+ * + */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class AmazonOrderDetailDto { + + @JsonProperty("sid") + private Long sid; + + @JsonProperty("amazon_order_id") + private String amazonOrderId; + + /** 配送方式:AFN / MFN。 */ + @JsonProperty("fulfillment_channel") + private String fulfillmentChannel; + + @JsonProperty("order_status") + private String orderStatus; + + /** 订单总金额;文档类型是 number。 */ + @JsonProperty("order_total_amount") + private String orderTotalAmount; + + /** 订单金额币种。 */ + @JsonProperty("currency") + private String currency; + + /** 币种符号。 */ + @JsonProperty("icon") + private String icon; + + /** 订购时间(站点时间)。 */ + @JsonProperty("purchase_date_local") + private String purchaseDateLocal; + + /** 订购时间(UTC);字段名就是 local_utc,不是笔误。 */ + @JsonProperty("purchase_date_local_utc") + private String purchaseDateLocalUtc; + + /** 订单更新时间(站点时间)。 */ + @JsonProperty("last_update_date") + private String lastUpdateDate; + + /** 订单更新时间(UTC)。 */ + @JsonProperty("last_update_date_utc") + private String lastUpdateDateUtc; + + /** 发货时间(站点时间);未发货为空串。 */ + @JsonProperty("shipment_date") + private String shipmentDate; + + @JsonProperty("sales_channel") + private String salesChannel; + + @JsonProperty("item_list") + private List itemList = new ArrayList(); +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailItemDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailItemDto.java index e69de29..67dabe0 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailItemDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDetailItemDto.java @@ -0,0 +1,72 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 领星 · 亚马逊 SC 订单详情的商品行({@code data[].item_list[]})。 + * + *

金额字段文档写 string,真实响应里 {@code unit_price_amount} / + * {@code item_discount} 是 number,用 String 接收两种都能读, + * 由 Source 统一清洗。

+ */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class AmazonOrderDetailItemDto { + + /** 订单商品自增 id。 */ + @JsonProperty("id") + private Long id; + + /** 订单商品编码;亚马逊可能变更,不能当稳定主键。 */ + @JsonProperty("order_item_id") + private String orderItemId; + + @JsonProperty("title") + private String title; + + /** 平台 MSKU。 */ + @JsonProperty("seller_sku") + private String sellerSku; + + @JsonProperty("asin") + private String asin; + + /** 本地 SKU。 */ + @JsonProperty("sku") + private String sku; + + @JsonProperty("product_name") + private String productName; + + /** 下单量。 */ + @JsonProperty("quantity_ordered") + private Integer quantityOrdered; + + /** 已配送量。 */ + @JsonProperty("quantity_shipped") + private Integer quantityShipped; + + /** 商品支付金额(含税)。 */ + @JsonProperty("item_price_amount") + private String itemPriceAmount; + + /** 商品税。 */ + @JsonProperty("item_tax_amount") + private String itemTaxAmount; + + /** 单价。 */ + @JsonProperty("unit_price_amount") + private String unitPriceAmount; + + /** 商品促销折扣。 */ + @JsonProperty("promotion_discount_amount") + private String promotionDiscountAmount; + + /** 商品折扣。 */ + @JsonProperty("item_discount") + private String itemDiscount; +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDto.java index e69de29..9f59c5f 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderDto.java @@ -0,0 +1,100 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 领星 · 亚马逊 SC 订单列表条目({@code /erp/sc/data/mws/orders} 的 {@code data[]})。 + * + *

与多平台订单的差异:

+ * + * + *

列表接口不返回单价/税额/折扣,这些字段只在订单详情里。

+ */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class AmazonOrderDto { + + /** 领星店铺 id。 */ + @JsonProperty("sid") + private Long sid; + + /** 店铺名称。 */ + @JsonProperty("seller_name") + private String sellerName; + + /** 亚马逊订单号,即 channelOrderId。 */ + @JsonProperty("amazon_order_id") + private String amazonOrderId; + + /** 订单状态:Pending / Unshipped / PartiallyShipped / Shipped / Canceled 等。 */ + @JsonProperty("order_status") + private String orderStatus; + + /** 订单金额;文档类型是 number。 */ + @JsonProperty("order_total_amount") + private String orderTotalAmount; + + /** 订单金额币种;金额为 0 时该字段可能为空。 */ + @JsonProperty("order_total_currency_code") + private String orderTotalCurrencyCode; + + /** 配送方式:AFN(亚马逊)/ MFN(自发货)。 */ + @JsonProperty("fulfillment_channel") + private String fulfillmentChannel; + + /** 邮编。 */ + @JsonProperty("postal_code") + private String postalCode; + + /** 销售渠道,如 Amazon.com。 */ + @JsonProperty("sales_channel") + private String salesChannel; + + /** 订购时间,亚马逊原始格式,如 {@code 2020-11-07T03:25:38Z}。 */ + @JsonProperty("purchase_date") + private String purchaseDate; + + /** 订购时间(UTC),{@code yyyy-MM-dd HH:mm:ss}。 */ + @JsonProperty("purchase_date_utc") + private String purchaseDateUtc; + + /** 订购时间(站点时间),{@code yyyy-MM-dd HH:mm:ss}。 */ + @JsonProperty("purchase_date_local") + private String purchaseDateLocal; + + /** 订单更新时间(站点时间)。 */ + @JsonProperty("last_update_date") + private String lastUpdateDate; + + /** 订单更新时间(UTC)。 */ + @JsonProperty("last_update_date_utc") + private String lastUpdateDateUtc; + + /** 订单修改时间(北京时间)。 */ + @JsonProperty("gmt_modified") + private String gmtModified; + + /** 订单修改时间(UTC)。 */ + @JsonProperty("gmt_modified_utc") + private String gmtModifiedUtc; + + /** 退款金额;文档类型是 number。 */ + @JsonProperty("refund_amount") + private String refundAmount; + + /** 商品明细。 */ + @JsonProperty("item_list") + private List itemList = new ArrayList(); +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderItemDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderItemDto.java index e69de29..c4fca49 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderItemDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonOrderItemDto.java @@ -0,0 +1,38 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 领星 · 亚马逊 SC 订单列表的商品行({@code data[].item_list[]})。 + * + *

只有 SKU / ASIN / 数量,金额字段在订单详情接口里。文档写 + * {@code quantity_ordered} 是 string,但真实响应可能是 number, + * 用 String 接收两种都能读。

+ */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class AmazonOrderItemDto { + + @JsonProperty("asin") + private String asin; + + /** 数量;文档类型是 string,真实响应可能是 number。 */ + @JsonProperty("quantity_ordered") + private String quantityOrdered; + + /** 平台 MSKU。 */ + @JsonProperty("seller_sku") + private String sellerSku; + + /** 领星本地 SKU。 */ + @JsonProperty("local_sku") + private String localSku; + + /** 本地品名。 */ + @JsonProperty("local_name") + private String localName; +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonSettlementTransactionDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonSettlementTransactionDto.java index e69de29..f97a042 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonSettlementTransactionDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/AmazonSettlementTransactionDto.java @@ -0,0 +1,134 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * 领星 · 亚马逊结算中心交易明细({@code data.records[]})。 + * + *

一行是一笔费用(佣金、配送费、退款、广告费……),不是订单合计。 + * 金额为负数表示扣款。

+ * + *

这里只保留对账需要的主干字段,其余字段(税费模型、促销 ID 等) + * 在需要时再补,避免 DTO 跟着文档无限膨胀。

+ */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class AmazonSettlementTransactionDto { + + /** 交易明细唯一标识;未结算时可能为空。 */ + @JsonProperty("uniqueKey") + private String uniqueKey; + + /** 主键编号,非唯一键。 */ + @JsonProperty("id") + private String id; + + /** 记录 MD5,兜底标识。 */ + @JsonProperty("md5") + private String md5; + + /** 亚马逊订单号。 */ + @JsonProperty("amazonOrderId") + private String amazonOrderId; + + /** 领星店铺 id。 */ + @JsonProperty("sid") + private Long sid; + + @JsonProperty("storeName") + private String storeName; + + /** 亚马逊店铺 id。 */ + @JsonProperty("sellerId") + private String sellerId; + + /** 国家。 */ + @JsonProperty("countryCode") + private String countryCode; + + /** 报告类型,如 Standard。 */ + @JsonProperty("accountType") + private String accountType; + + /** 配送方式,如 FBA / FBM。 */ + @JsonProperty("fulfillment") + private String fulfillment; + + /** 来源事件,如 Shipment / Refund / ServiceFee。 */ + @JsonProperty("eventType") + private String eventType; + + /** 平台 MSKU。 */ + @JsonProperty("sellerSku") + private String sellerSku; + + /** 交易类型,如 Commission / Tax / Refund。 */ + @JsonProperty("type") + private String type; + + /** 结算时间(站点时间,带偏移),如 {@code 2022-09-10T23:55:12+01:00}。 */ + @JsonProperty("postedDateLocale") + private String postedDateLocale; + + /** 结算日期,0 时区,如 {@code 2024-06-06T08:29:00Z}。 */ + @JsonProperty("postedDate") + private String postedDate; + + /** 币种。 */ + @JsonProperty("currencyCode") + private String currencyCode; + + /** 金额;文档类型是 number,用 String 兼容。 */ + @JsonProperty("currencyAmount") + private String currencyAmount; + + @JsonProperty("quantity") + private Integer quantity; + + /** 结算状态:Open 未结算 / Closed 已结算 / Reconciled 已对账。 */ + @JsonProperty("processingStatus") + private String processingStatus; + + /** 转账状态:Succeeded / Processing / Failed / Unknown。 */ + @JsonProperty("fundTransferStatus") + private String fundTransferStatus; + + /** 结算编号。 */ + @JsonProperty("fid") + private String fid; + + @JsonProperty("settlementId") + private String settlementId; + + /** 领星本地 SKU。 */ + @JsonProperty("localSku") + private String localSku; + + /** 领星本地品名。 */ + @JsonProperty("localName") + private String localName; + + /** 修改时间(领星系统时间)。 */ + @JsonProperty("gmtModified") + private String gmtModified; + + /** 商家订单 ID。 */ + @JsonProperty("merchantOrderId") + private String merchantOrderId; + + @JsonProperty("marketplaceName") + private String marketplaceName; + + @JsonProperty("asin") + private String asin; + + @JsonProperty("fnsku") + private String fnsku; + + @JsonProperty("orderItemId") + private String orderItemId; +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDetailDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDetailDto.java index e69de29..17470c6 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDetailDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/sc/dto/FbmOrderDetailDto.java @@ -0,0 +1,112 @@ +package common.ecommerce.lingxing.platform.amazon.sc.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import common.ecommerce.lingxing.platform.amazon.dto.FbmOrderItemDto; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 领星 · 亚马逊 FBM 订单详情 + * ({@code /erp/sc/routing/order/Order/getOrderDetail} 的 {@code data})。 + * + *

注意 {@code data} 是对象,不是数组。

+ */ +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class FbmOrderDetailDto { + + /** 领星系统单号。 */ + @JsonProperty("order_number") + private String orderNumber; + + /** 订单状态(中文原值)。 */ + @JsonProperty("order_status") + private String orderStatus; + + @JsonProperty("order_from_name") + private String orderFromName; + + /** 订购时间。 */ + @JsonProperty("purchase_time") + private String purchaseTime; + + /** 平台,如 AMAZON。 */ + @JsonProperty("platform") + private String platform; + + @JsonProperty("shop_name") + private String shopName; + + @JsonProperty("buyer_choose_express") + private String buyerChooseExpress; + + /** 客付运费。 */ + @JsonProperty("total_shipping_price") + private String totalShippingPrice; + + @JsonProperty("buyer_message") + private String buyerMessage; + + @JsonProperty("customer_comment") + private String customerComment; + + @JsonProperty("warehouse_name") + private String warehouseName; + + @JsonProperty("wid") + private Long wid; + + @JsonProperty("tracking_number") + private String trackingNumber; + + @JsonProperty("logistics_type_name") + private String logisticsTypeName; + + @JsonProperty("logistics_provider_name") + private String logisticsProviderName; + + @JsonProperty("logistics_type_id") + private Long logisticsTypeId; + + @JsonProperty("logistics_provider_id") + private Long logisticsProviderId; + + @JsonProperty("logistics_pre_weight") + private String logisticsPreWeight; + + @JsonProperty("logistics_pre_weight_unit") + private String logisticsPreWeightUnit; + + @JsonProperty("logistics_pre_price") + private String logisticsPrePrice; + + /** 物流运费。 */ + @JsonProperty("logistics_freight") + private String logisticsFreight; + + @JsonProperty("logistics_freight_currency_code") + private String logisticsFreightCurrencyCode; + + @JsonProperty("pkg_real_weight") + private String pkgRealWeight; + + @JsonProperty("pkg_real_weight_unit") + private String pkgRealWeightUnit; + + /** 订单总金额;文档没给币种,按商品行币种解释。 */ + @JsonProperty("order_price_amount") + private String orderPriceAmount; + + /** 订单毛利润。 */ + @JsonProperty("gross_profit_amount") + private String grossProfitAmount; + + /** 订单商品行。 */ + @JsonProperty("order_item") + private List orderItem = new ArrayList(); +} diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java index 76fbc4b..1e69a04 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/settlement/AmazonSettlementSource.java @@ -9,7 +9,7 @@ import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.mapper.LingxingOrderMapper; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.lingxing.platform.amazon.dto.AmazonSettlementTransactionDto; +import common.ecommerce.lingxing.platform.amazon.sc.dto.AmazonSettlementTransactionDto; import common.ecommerce.lingxing.platform.settlement.LingxingSettlementSource; import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.account.ChannelAccount; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/dto/WalmartListingDto.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/dto/WalmartListingDto.java index 88b371a..4466b55 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/dto/WalmartListingDto.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/dto/WalmartListingDto.java @@ -26,10 +26,6 @@ public class WalmartListingDto { @JsonProperty("item_url") private String itemUrl; - /** Walmart 商品 ID。 */ - @JsonProperty("item_id") - private String itemId; - /** 图片链接。 */ @JsonProperty("picture_url") private String pictureUrl;