From 6a22e9057c9d16779973c26d49de57deca0001af Mon Sep 17 00:00:00 2001
From: chenchuchuan <13554600537@163.com>
Date: Tue, 3 Nov 2026 11:29:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(lingxing):=20=C2=A5=20=E7=AC=A6=E5=8F=B7?=
=?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8C=89=E6=97=A5=E5=85=83=E5=A4=84=E7=90=86?=
=?UTF-8?q?=EF=BC=8CCNY=20=E8=A7=86=E4=B8=BA=E4=BA=BA=E6=B0=91=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
约定:渠道只给货币符号时,¥ / ¥ 一律映射 JPY;
人民币由平台以 ISO 代码 CNY(或 RMB)返回,显式映射 CNY。
涉及 SC 之外的全部商品实现:
- AmazonVcProductSource
- WalmartProductSource
- TemuProductSource
- ShopifyProductSource
此前 ¥ 返回 null 导致价格被置空,现可正常落库。
Co-Authored-By: Claude
---
.../platform/amazon/vc/product/AmazonVcProductSource.java | 11 +++++++----
.../platform/shopify/product/ShopifyProductSource.java | 9 ++++++++-
.../lingxing/platform/temu/product/TemuProductSource.java | 11 +++++++++--
.../platform/walmart/product/WalmartProductSource.java | 7 +++++++
4 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
index c303446..6b0d1f7 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/amazon/vc/product/AmazonVcProductSource.java
@@ -88,8 +88,8 @@ public final class AmazonVcProductSource implements LingxingProductSource {
*
*
* 币种说明:VC 只给货币符号({@code price_currency_icon}),不给 ISO 代码。
- * 这里按符号反推常见币种,反推不出时 currency 为 null、price 也为 null,
- * 原值保留在 attributes 里。改由店铺币种兜底需要账户信息,当前不猜。
+ * 按符号反推常见币种;约定 {@code ¥} 符号一律视为日元(人民币以 ISO 代码 {@code CNY} 返回)。
+ * 反推不出时 currency 为 null、price 也为 null,原值保留在 attributes 里。
*/
private ProductListing toProductListing(AmazonVcListingDto dto, LingxingCall call) {
ZoneId zone = ZoneId.of(call.ctx().account().marketplaceZone());
@@ -179,8 +179,11 @@ public final class AmazonVcProductSource implements LingxingProductSource {
return "GBP";
}
if ("¥".equals(s) || "¥".equals(s)) {
- // 人民币与日元共用符号,无法区分;返回 null 避免误判
- return null;
+ // 约定:¥ 符号按日元处理;人民币由平台以 ISO 代码 CNY 返回
+ return "JPY";
+ }
+ if ("CNY".equalsIgnoreCase(s) || "RMB".equalsIgnoreCase(s)) {
+ return "CNY";
}
if ("C$".equals(s) || "CA$".equals(s)) {
return "CAD";
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shopify/product/ShopifyProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shopify/product/ShopifyProductSource.java
index 3f14368..1ad1968 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/shopify/product/ShopifyProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/shopify/product/ShopifyProductSource.java
@@ -207,7 +207,7 @@ public final class ShopifyProductSource implements LingxingProductSource {
return attrs;
}
- /** 货币符号 → ISO;¥/¥ 无法区分人民币与日元,返回 null。 */
+ /** 货币符号 → ISO;约定 ¥ 符号视为日元,人民币以 ISO 代码 CNY 返回。 */
private static String currencyOf(String icon) {
if (icon == null) {
return null;
@@ -222,6 +222,13 @@ public final class ShopifyProductSource implements LingxingProductSource {
if ("£".equals(s)) {
return "GBP";
}
+ if ("¥".equals(s) || "¥".equals(s)) {
+ // 约定:¥ 符号按日元处理;人民币由平台以 ISO 代码 CNY 返回
+ return "JPY";
+ }
+ if ("CNY".equalsIgnoreCase(s) || "RMB".equalsIgnoreCase(s)) {
+ return "CNY";
+ }
return null;
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
index b34ed72..a042b89 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/temu/product/TemuProductSource.java
@@ -119,8 +119,8 @@ public final class TemuProductSource implements LingxingProductSource {
*
*
* 价格说明:Temu 要求上报「申报价」,{@code supplyPriceList} 按时间区间分段,
- * 取 {@code endStr} 为空(当前生效)或开始时间最晚的一条。币种字段是符号「¥」,
- * 无法区分人民币/日元,按符号映射为 null 时不填金额。
+ * 取 {@code endStr} 为空(当前生效)或开始时间最晚的一条。
+ * 币种按约定:{@code ¥} 符号视为日元,ISO 代码 {@code CNY} 视为人民币。
*/
private ProductListing toProductListing(TemuListingDto dto, LingxingCall call) {
TemuSupplyPriceDto price = currentSupplyPrice(dto.getSupplyPriceList());
@@ -240,6 +240,13 @@ public final class TemuProductSource implements LingxingProductSource {
if ("£".equals(s)) {
return "GBP";
}
+ if ("¥".equals(s) || "¥".equals(s)) {
+ // 约定:¥ 符号按日元处理;人民币由平台以 ISO 代码 CNY 返回
+ return "JPY";
+ }
+ if ("CNY".equalsIgnoreCase(s) || "RMB".equalsIgnoreCase(s)) {
+ return "CNY";
+ }
return null;
}
diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
index 91240d2..20ae14a 100644
--- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
+++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/walmart/product/WalmartProductSource.java
@@ -217,6 +217,13 @@ public final class WalmartProductSource implements LingxingProductSource {
if ("MXN".equals(s) || "MX$".equals(s)) {
return "MXN";
}
+ if ("¥".equals(s) || "¥".equals(s)) {
+ // 约定:¥ 符号按日元处理;人民币由平台以 ISO 代码 CNY 返回
+ return "JPY";
+ }
+ if ("CNY".equalsIgnoreCase(s) || "RMB".equalsIgnoreCase(s)) {
+ return "CNY";
+ }
return null;
}