Browse Source
信仓没有 upsert 接口,createOrUpdate 按「先查临时产品,有则更新、无则新增」实现: - GET api.productlist?state=0 按 SKU 查临时产品,结果再按 product_no 精确比对, 防止 key 模糊匹配把相似 SKU 误判为已存在 - 命中走 api.update_product(只对临时产品有效),否则 api.add_product - 写接口 token 同时放 query(文档通用约定)与请求体(产品接口 schema 要求) - WarehouseProduct 的 cm / g 按常量换算成信仓的 inch / lbs,保留 4 位小数; 金额取 declaredValue 并固定 USD,非美元直接拒绝,避免静默按美元记错价 - bar_code 缺失时退回 SKU;packing_rate 固定 1(必填项); 包装方式 / SN / 海关等信仓未定义的字段不发送 - 适配器改为实现 WarehouseProductCapable,能力位声明 PRODUCT 未接入 api.pub_product:建档结果仍是临时产品(state=0),上架正式产品另行接入。 Co-Authored-By: Claude Code <noreply@anthropic.com>feature/supplier-lingxing
8 changed files with 648 additions and 19 deletions
@ -0,0 +1,114 @@ |
|||||||
|
package common.ecommerce.xincang.adapter; |
||||||
|
|
||||||
|
import common.ecommerce.shared.support.Money; |
||||||
|
import common.ecommerce.warehouse.capability.WarehouseProduct; |
||||||
|
import common.ecommerce.xincang.XincangConstants; |
||||||
|
import common.ecommerce.xincang.dto.XincangDtos; |
||||||
|
|
||||||
|
import java.math.BigDecimal; |
||||||
|
import java.math.RoundingMode; |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓商品报文映射({@code POST api.add_product} / {@code api.update_product})。 |
||||||
|
* |
||||||
|
* <p>平台字段名只出现在本类与 {@link XincangDtos}。单位换算也在这里: |
||||||
|
* 统一模型用 cm / g,信仓用 inch / lbs,按 {@link XincangConstants} 里的常量换算并保留 4 位小数 |
||||||
|
* (文档「最长四位小数」)。</p> |
||||||
|
* |
||||||
|
* <p>文档未定义「包装方式 / 是否 SN / 客退处理 / 海关信息」等字段,这些统一模型字段 |
||||||
|
* <b>不发送</b>,避免自行编造平台不认的键。</p> |
||||||
|
*/ |
||||||
|
public final class XincangProductMapper { |
||||||
|
|
||||||
|
/** 文档限制:数量类字段最长四位小数。 */ |
||||||
|
private static final int SCALE = 4; |
||||||
|
/** 金额最长两位小数。 */ |
||||||
|
private static final int AMOUNT_SCALE = 2; |
||||||
|
/** 装箱率未提供时按 1 发送(必填项)。 */ |
||||||
|
private static final int DEFAULT_PACKING_RATE = 1; |
||||||
|
|
||||||
|
private XincangProductMapper() { |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 统一商品 → 信仓新增 / 更新请求。 |
||||||
|
* |
||||||
|
* @param product 已通过 {@link WarehouseProduct} 构造期校验的商品 |
||||||
|
* @param token 业务令牌;两个接口的请求体都要求 |
||||||
|
* @throws IllegalArgumentException 申报价值不是美元(信仓 amount 固定 USD) |
||||||
|
*/ |
||||||
|
public static XincangDtos.ProductRequest toRequest(WarehouseProduct product, String token) { |
||||||
|
XincangDtos.ProductRequest req = new XincangDtos.ProductRequest(); |
||||||
|
req.token = token; |
||||||
|
req.productNo = skuOf(product); |
||||||
|
req.chnName = product.name(); |
||||||
|
req.amount = amount(product.declaredValue()); |
||||||
|
req.barCode = barcodeOf(product); |
||||||
|
req.weightLbs = decimal(product.weightGrams()) |
||||||
|
.divide(decimal(XincangConstants.GRAMS_PER_POUND), SCALE, RoundingMode.HALF_UP); |
||||||
|
req.packingRate = DEFAULT_PACKING_RATE; |
||||||
|
req.sizeLLn = inches(product.lengthCm()); |
||||||
|
req.sizeWLn = inches(product.widthCm()); |
||||||
|
req.sizeHLn = inches(product.heightCm()); |
||||||
|
req.remark = trimToNull(product.remark()); |
||||||
|
req.ckm = trimToNull(product.customItemNo()); |
||||||
|
req.productType = product.productType() > 0 ? product.productType() : null; |
||||||
|
return req; |
||||||
|
} |
||||||
|
|
||||||
|
/** 仓侧 SKU 优先;没有映射时用 OMS 主 SKU。 */ |
||||||
|
public static String skuOf(WarehouseProduct product) { |
||||||
|
String providerSku = product.providerSku(); |
||||||
|
if (providerSku != null && !providerSku.trim().isEmpty()) { |
||||||
|
return providerSku.trim(); |
||||||
|
} |
||||||
|
return product.omsSku(); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 条码:统一模型未给条码时退回 SKU。 |
||||||
|
* |
||||||
|
* <p>信仓把 {@code bar_code} 列为必填且查重(重复会报「产品条形码已存在」), |
||||||
|
* 用 SKU 兜底可以保证单次建档能通过;调用方应尽量显式给真实条码。</p> |
||||||
|
*/ |
||||||
|
public static String barcodeOf(WarehouseProduct product) { |
||||||
|
String barcode = product.barcode(); |
||||||
|
if (barcode != null && !barcode.trim().isEmpty()) { |
||||||
|
return barcode.trim(); |
||||||
|
} |
||||||
|
return skuOf(product); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 金额:取申报价值。 |
||||||
|
* |
||||||
|
* <p>信仓 {@code amount} 固定美元且最多两位小数,其他币种直接拒绝,避免静默按美元记错价。 |
||||||
|
* 未给申报价值时按 0.00 发送(文档必填项)。</p> |
||||||
|
*/ |
||||||
|
private static BigDecimal amount(Money declaredValue) { |
||||||
|
if (declaredValue == null) { |
||||||
|
return BigDecimal.ZERO.setScale(AMOUNT_SCALE, RoundingMode.UNNECESSARY); |
||||||
|
} |
||||||
|
if (!"USD".equalsIgnoreCase(declaredValue.currencyCode())) { |
||||||
|
throw new IllegalArgumentException( |
||||||
|
"xincang product amount is USD only, got " + declaredValue.currencyCode()); |
||||||
|
} |
||||||
|
return declaredValue.amount().setScale(AMOUNT_SCALE, RoundingMode.HALF_UP); |
||||||
|
} |
||||||
|
|
||||||
|
private static BigDecimal inches(double cm) { |
||||||
|
return decimal(cm).divide(decimal(XincangConstants.CENTIMETERS_PER_INCH), SCALE, RoundingMode.HALF_UP); |
||||||
|
} |
||||||
|
|
||||||
|
private static BigDecimal decimal(double value) { |
||||||
|
return BigDecimal.valueOf(value); |
||||||
|
} |
||||||
|
|
||||||
|
private static String trimToNull(String v) { |
||||||
|
if (v == null) { |
||||||
|
return null; |
||||||
|
} |
||||||
|
String trimmed = v.trim(); |
||||||
|
return trimmed.isEmpty() ? null : trimmed; |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,251 @@ |
|||||||
|
package common.ecommerce.xincang.adapter; |
||||||
|
|
||||||
|
import common.ecommerce.shared.spi.ChannelSecret; |
||||||
|
import common.ecommerce.shared.support.Money; |
||||||
|
import common.ecommerce.shared.testkit.InMemoryLockProvider; |
||||||
|
import common.ecommerce.shared.testkit.InMemoryTokenStore; |
||||||
|
import common.ecommerce.shared.testkit.MutableClock; |
||||||
|
import common.ecommerce.shared.testkit.RecordingTransport; |
||||||
|
import common.ecommerce.shared.testkit.Responses; |
||||||
|
import common.ecommerce.warehouse.WarehouseCapability; |
||||||
|
import common.ecommerce.warehouse.WarehouseProvider; |
||||||
|
import common.ecommerce.warehouse.capability.WarehouseProduct; |
||||||
|
import common.ecommerce.warehouse.capability.WarehouseProductCapable.ProductResult; |
||||||
|
import common.ecommerce.warehouse.sdk.WarehouseConnection; |
||||||
|
import common.ecommerce.warehouse.sdk.WarehouseContext; |
||||||
|
import common.ecommerce.xincang.XincangConstants; |
||||||
|
import org.junit.jupiter.api.BeforeEach; |
||||||
|
import org.junit.jupiter.api.Test; |
||||||
|
|
||||||
|
import java.time.Clock; |
||||||
|
import java.time.Duration; |
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*; |
||||||
|
|
||||||
|
/** |
||||||
|
* 信仓商品建档契约测试。 |
||||||
|
* |
||||||
|
* <p>覆盖:先查临时产品再决定 add / update、单位换算(cm→inch、g→lbs)、 |
||||||
|
* token 在两处(query 与 body)、必填兜底与错误传播。</p> |
||||||
|
*/ |
||||||
|
class XincangProductTest { |
||||||
|
|
||||||
|
private static final String BASE = XincangConstants.TEST_BASE_URL; |
||||||
|
private static final String APP_KEY = "ak-1"; |
||||||
|
|
||||||
|
private RecordingTransport transport; |
||||||
|
private XincangAdapter adapter; |
||||||
|
|
||||||
|
@BeforeEach |
||||||
|
void setUp() { |
||||||
|
transport = RecordingTransport.create(); |
||||||
|
MutableClock clock = MutableClock.atUtc("2026-11-09T00:00:00Z"); |
||||||
|
transport.route(XincangConstants.PATH_LOGIN, req -> Responses.ok( |
||||||
|
"{\"rst\":{\"id\":\"c-1\",\"token\":\"{T-1}\",\"token_expire_time\":\"" |
||||||
|
+ java.time.LocalDateTime.ofInstant(clock.instant().plus(Duration.ofHours(2)), |
||||||
|
XincangConstants.SYSTEM_ZONE) |
||||||
|
.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) |
||||||
|
+ "\"},\"errno\":0,\"err\":\"\",\"trace_id\":\"t-login\"}")); |
||||||
|
adapter = new XincangAdapter(transport, new common.ecommerce.http.JacksonJsonCodec(), |
||||||
|
new InMemoryTokenStore(), new InMemoryLockProvider(), clock); |
||||||
|
} |
||||||
|
|
||||||
|
private static WarehouseContext ctx() { |
||||||
|
return WarehouseContext.of("XC-CA-3790", WarehouseProvider.XINCANG, "CA-3790", |
||||||
|
WarehouseConnection.of(BASE, ChannelSecret.builder() |
||||||
|
.appKey(APP_KEY).appSecret("sk").build()), |
||||||
|
"req-1", Clock.systemUTC()); |
||||||
|
} |
||||||
|
|
||||||
|
private static WarehouseProduct product(String sku) { |
||||||
|
return WarehouseProduct.builder() |
||||||
|
.omsSku(sku) |
||||||
|
.name("测试商品") |
||||||
|
.nameEn("Test Product") |
||||||
|
.barcode("BARCODE-1") |
||||||
|
.packingType(0) |
||||||
|
.lengthCm(30.48) |
||||||
|
.widthCm(25.4) |
||||||
|
.heightCm(10) |
||||||
|
.weightGrams(1000) |
||||||
|
.productType(1) |
||||||
|
// 统一模型要求海关三项整组给(信仓不发送这三项,只取 declaredValue 作 amount)
|
||||||
|
.declaredValue(Money.of("30.49", "USD")) |
||||||
|
.hsCode("9403600000") |
||||||
|
.countryOfOrigin("US") |
||||||
|
.remark("remark 1") |
||||||
|
.build(); |
||||||
|
} |
||||||
|
|
||||||
|
/** 产品列表:给定条目 JSON 数组内容。 */ |
||||||
|
private void routeProductList(String dataJson) { |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_LIST, req -> Responses.ok( |
||||||
|
"{\"rst\":{\"code\":\"0\",\"msg\":\"\",\"data\":" + dataJson + ",\"count\":\"1\"}," |
||||||
|
+ "\"errno\":0,\"err\":\"\",\"trace_id\":\"t-list\"}")); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void addsProductWhenSkuIsNew() { |
||||||
|
routeProductList("[]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-add\"}")); |
||||||
|
|
||||||
|
ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST001")); |
||||||
|
|
||||||
|
assertEquals("APITEST001", result.providerSku()); |
||||||
|
assertEquals("ADDED", result.status()); |
||||||
|
assertEquals("0", result.rawStatus()); |
||||||
|
|
||||||
|
// 三个请求:登录 → 产品列表 → 新增
|
||||||
|
assertEquals(3, transport.recorded().size()); |
||||||
|
|
||||||
|
String addBody = transport.lastDataRequest().body(); |
||||||
|
assertTrue(addBody.contains("\"product_no\":\"APITEST001\""), addBody); |
||||||
|
assertTrue(addBody.contains("\"chn_name\":\"测试商品\""), addBody); |
||||||
|
assertTrue(addBody.contains("\"bar_code\":\"BARCODE-1\""), addBody); |
||||||
|
assertTrue(addBody.contains("\"amount\":30.49"), addBody); |
||||||
|
// 1000g → 2.2046 lbs;30.48cm → 12.0000 in
|
||||||
|
assertTrue(addBody.contains("\"weight_lbs\":2.2046"), addBody); |
||||||
|
assertTrue(addBody.contains("\"size_l_ln\":12.0000"), addBody); |
||||||
|
assertTrue(addBody.contains("\"size_w_ln\":10.0000"), addBody); |
||||||
|
assertTrue(addBody.contains("\"size_h_ln\":3.9370"), addBody); |
||||||
|
assertTrue(addBody.contains("\"packing_rate\":1"), addBody); |
||||||
|
assertTrue(addBody.contains("\"product_type\":1"), addBody); |
||||||
|
// token 在 body 与 query 两处
|
||||||
|
assertTrue(addBody.contains("\"token\":\"{T-1}\""), addBody); |
||||||
|
assertTrue(transport.lastDataRequest().url().endsWith("/api.add_product?token=%7BT-1%7D"), |
||||||
|
transport.lastDataRequest().url()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void updatesProductWhenTemporaryAlreadyExists() { |
||||||
|
routeProductList("[{\"product_no\":\"APITEST001\",\"state\":\"0\"}]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_UPDATE, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\",\"trace_id\":\"t-upd\"}")); |
||||||
|
|
||||||
|
ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST001")); |
||||||
|
|
||||||
|
assertEquals("UPDATED", result.status()); |
||||||
|
assertTrue(transport.lastDataRequest().url().contains("/api.update_product"), "应走更新接口"); |
||||||
|
assertTrue(!transport.lastDataRequest().url().contains("/api.add_product")); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void listQueryUsesStateTemporaryAndSkuKey() { |
||||||
|
routeProductList("[]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||||
|
|
||||||
|
adapter.createOrUpdate(ctx(), product("APITEST002")); |
||||||
|
|
||||||
|
// dataRequests() 会排除含 /oauth/access-token 的请求,但信仓登录路径是 /api.login,
|
||||||
|
// 需要按路径自己取业务请求
|
||||||
|
String listUrl = null; |
||||||
|
for (common.ecommerce.http.HttpRequest req : transport.recorded()) { |
||||||
|
if (req.url().contains(XincangConstants.PATH_PRODUCT_LIST)) { |
||||||
|
listUrl = req.url(); |
||||||
|
} |
||||||
|
} |
||||||
|
assertNotNull(listUrl, "应调用产品列表"); |
||||||
|
assertTrue(listUrl.contains("/api.productlist?"), listUrl); |
||||||
|
assertTrue(listUrl.contains("state=0"), listUrl); |
||||||
|
assertTrue(listUrl.contains("key=APITEST002"), listUrl); |
||||||
|
assertTrue(listUrl.contains("token=%7BT-1%7D"), listUrl); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void skuIsFilteredExactlySoSimilarSkuIsNotMistakenAsExisting() { |
||||||
|
// 列表按 key 模糊返回了别的 SKU,必须再精确比对
|
||||||
|
routeProductList("[{\"product_no\":\"APITEST003-OLD\",\"state\":\"0\"}]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||||
|
|
||||||
|
ProductResult result = adapter.createOrUpdate(ctx(), product("APITEST003")); |
||||||
|
|
||||||
|
assertEquals("ADDED", result.status()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void formalProductIsNotTreatedAsUpdatable() { |
||||||
|
// 正式产品(state=1)不在临时产品列表里;新增会让信仓报「SKU已存在」,原样抛出
|
||||||
|
routeProductList("[]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":null,\"errno\":-1,\"err\":\"产品SKU已存在\",\"trace_id\":\"t-dup\"}")); |
||||||
|
|
||||||
|
common.ecommerce.shared.error.PlatformBusinessException e = |
||||||
|
assertThrows(common.ecommerce.shared.error.PlatformBusinessException.class, |
||||||
|
() -> adapter.createOrUpdate(ctx(), product("APITEST004"))); |
||||||
|
|
||||||
|
assertTrue(e.getMessage().contains("产品SKU已存在"), e.getMessage()); |
||||||
|
assertEquals("t-dup", e.platformRequestId()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void barcodeFallsBackToSkuAndAmountToZeroWhenMissing() { |
||||||
|
routeProductList("[]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||||
|
WarehouseProduct noBarcode = WarehouseProduct.builder() |
||||||
|
.omsSku("APITEST005") |
||||||
|
.name("测试商品") |
||||||
|
.nameEn("Test") |
||||||
|
.packingType(0) |
||||||
|
.lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) |
||||||
|
.build(); |
||||||
|
|
||||||
|
adapter.createOrUpdate(ctx(), noBarcode); |
||||||
|
|
||||||
|
String body = transport.lastDataRequest().body(); |
||||||
|
assertTrue(body.contains("\"bar_code\":\"APITEST005\""), body); |
||||||
|
assertTrue(body.contains("\"amount\":0.00"), body); |
||||||
|
// 未指定产品类型时不发该字段
|
||||||
|
assertTrue(!body.contains("product_type"), body); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void nonUsdDeclaredValueIsRejectedBeforeSending() { |
||||||
|
WarehouseProduct eur = WarehouseProduct.builder() |
||||||
|
.omsSku("APITEST006") |
||||||
|
.name("测试商品") |
||||||
|
.nameEn("Test") |
||||||
|
.barcode("B-6") |
||||||
|
.packingType(0) |
||||||
|
.lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) |
||||||
|
.declaredValue(Money.of("10.00", "EUR")) |
||||||
|
.hsCode("9403600000") |
||||||
|
.countryOfOrigin("DE") |
||||||
|
.build(); |
||||||
|
|
||||||
|
IllegalArgumentException e = assertThrows(IllegalArgumentException.class, |
||||||
|
() -> adapter.createOrUpdate(ctx(), eur)); |
||||||
|
assertTrue(e.getMessage().contains("USD"), e.getMessage()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void providerSkuWinsWhenMapped() { |
||||||
|
routeProductList("[]"); |
||||||
|
transport.route(XincangConstants.PATH_PRODUCT_ADD, req -> Responses.ok( |
||||||
|
"{\"rst\":true,\"errno\":0,\"err\":\"\"}")); |
||||||
|
WarehouseProduct mapped = WarehouseProduct.builder() |
||||||
|
.omsSku("OMS-1") |
||||||
|
.providerSku("XC-1") |
||||||
|
.name("测试商品") |
||||||
|
.nameEn("Test") |
||||||
|
.barcode("B-1") |
||||||
|
.packingType(0) |
||||||
|
.lengthCm(10).widthCm(10).heightCm(10).weightGrams(100) |
||||||
|
.build(); |
||||||
|
|
||||||
|
ProductResult result = adapter.createOrUpdate(ctx(), mapped); |
||||||
|
|
||||||
|
assertEquals("XC-1", result.providerSku()); |
||||||
|
assertTrue(transport.lastDataRequest().body().contains("\"product_no\":\"XC-1\"")); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
void productCapabilityIsDeclared() { |
||||||
|
assertTrue(adapter.capabilities().contains(WarehouseCapability.PRODUCT)); |
||||||
|
assertFalse(adapter.capabilities().contains(WarehouseCapability.OUTBOUND)); |
||||||
|
assertTrue(adapter.supports("XC-CA-3790", WarehouseCapability.PRODUCT)); |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue