From 03a45c3eb408165395e1f332719da274bda3d904 Mon Sep 17 00:00:00 2001 From: huangyujie <27665451@qq.com> Date: Fri, 10 Apr 2026 20:23:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(pdd):=20=E5=8F=91=E5=93=81/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=88=90=E5=8A=9F=E5=90=8E=E4=B8=8D=E5=86=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8B=89=20detail.get=EF=BC=8C=E7=94=B1=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made-with: Cursor --- .../pdd/OGoodsPddMappingPersistence.java | 76 ++----------------- .../external/pdd/PddOpenApiSupport.java | 2 +- 2 files changed, 7 insertions(+), 71 deletions(-) diff --git a/service/src/main/java/cn/qihangerp/service/external/pdd/OGoodsPddMappingPersistence.java b/service/src/main/java/cn/qihangerp/service/external/pdd/OGoodsPddMappingPersistence.java index 5773c851..f3438473 100644 --- a/service/src/main/java/cn/qihangerp/service/external/pdd/OGoodsPddMappingPersistence.java +++ b/service/src/main/java/cn/qihangerp/service/external/pdd/OGoodsPddMappingPersistence.java @@ -3,12 +3,9 @@ package cn.qihangerp.service.external.pdd; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.request.ExternalGoodsUpsertRequest; -import cn.qihangerp.model.request.ExternalPddGoodsDetailRequest; import cn.qihangerp.model.vo.ExternalGoodsUpsertResultVo; -import cn.qihangerp.model.vo.ExternalPddGoodsDetailResultVo; import cn.qihangerp.module.service.OGoodsService; import cn.qihangerp.module.service.OGoodsSkuService; -import cn.qihangerp.service.external.ExternalPddGoodsDetailAppService; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -27,8 +24,9 @@ import java.util.Map; * 各渠道在 {@code o_goods}/{@code o_goods_sku}.{@code canonicalExt} 使用独立键名（拼多多为 {@value #CANONICAL_PDD_GOODS_ID}、{@value #CANONICAL_PDD_SKU_ID}）， * 未来京东/天猫可并行增加 {@code jdSkuId} 等，改库存接口按平台从本库解析后再调 POP。

* - *

拼多多：{@code pdd.goods.add} 响应可解析 SKU 映射；{@code pdd.goods.information.update} 往往不带 {@code sku_list}， - * 因此在 upsert 成功后若仍有 SKU 未写入 {@value #CANONICAL_PDD_SKU_ID}，将自动补调 {@code pdd.goods.detail.get} 回填。

+ *

拼多多：仅根据 {@code pdd.goods.add} 成功响应中的 {@code sku_list} 回填 {@value #CANONICAL_PDD_SKU_ID}；不在本服务内调用 + * {@code pdd.goods.detail.get}。{@code pdd.goods.information.update} 若未带 {@code sku_list}，则 {@code pddSkuId} 须由主数据在适当时机 + * 调 {@code POST /external/pdd/goods/detail} 后自行落库或后续扩展同步接口写回 ERP（当前 detail 接口仅返回 JSON 给调用方）。

*/ @Slf4j @Component @@ -40,12 +38,12 @@ public class OGoodsPddMappingPersistence { private final OGoodsService goodsService; private final OGoodsSkuService skuService; - private final ExternalPddGoodsDetailAppService externalPddGoodsDetailAppService; /** * 在 upsert 拼多多链路成功（{@link ExternalGoodsUpsertResultVo#getPddPublishSuccess()}==true）后调用。 + *

只落 {@code pddGoodsId}，以及 {@code GOODS_ADD} 响应片段中能解析到的 SKU 映射；不发起 {@code detail.get}。

* - * @param req 用于携带 {@code pddPopAuth}，在需补拉 {@code pdd.goods.detail.get} 时使用；可为 {@code null}（则无法补全 SKU 映射） + * @param req 保留入参供调用方兼容；本方法不再使用 {@code pddPopAuth} 拉 detail */ public void persistAfterPddPublishSuccess(Long erpGoodsId, ExternalGoodsUpsertRequest req, ExternalGoodsUpsertResultVo vo) { @@ -75,38 +73,9 @@ public class OGoodsPddMappingPersistence { log.info("[PDD] persisted pddGoodsId + sku from GOODS_ADD snippet erpGoodsId={} lane={} skuRowsUpdated={}", erpGoodsId, lane, fromAdd); } else { - log.info("[PDD] persisted pddGoodsId on o_goods (no GOODS_ADD sku_list) erpGoodsId={} lane={}", + log.info("[PDD] persisted pddGoodsId on o_goods (no GOODS_ADD sku_list; no ERP-side detail.get) erpGoodsId={} lane={}", erpGoodsId, lane); } - - if (!anySkuMissingPddSkuId(erpGoodsId)) { - return; - } - if (req == null || req.getPddPopAuth() == null) { - log.warn("[PDD] skip detail.get backfill: missing pddPopAuth erpGoodsId={} lane={}", - erpGoodsId, lane); - return; - } - - ExternalPddGoodsDetailRequest dreq = new ExternalPddGoodsDetailRequest(); - dreq.setPddGoodsId(pddGoodsId); - dreq.setPddPopAuth(req.getPddPopAuth()); - ExternalPddGoodsDetailResultVo detailVo = externalPddGoodsDetailAppService.fetchGoodsDetail(dreq); - if (!Boolean.TRUE.equals(detailVo.getPopBizSuccess()) || !StringUtils.hasText(detailVo.getPopResponseBody())) { - log.warn("[PDD] detail.get backfill failed erpGoodsId={} pddGoodsId={} msg={}", - erpGoodsId, pddGoodsId, detailVo.getMessage()); - return; - } - Map fromDetail = - PddOpenApiSupport.parseOuterKeyToPddSkuIdFromGoodsDetailGetResponse(detailVo.getPopResponseBody()); - int fromDetailCount = applyPddSkuMappings(erpGoodsId, fromDetail); - if (fromDetailCount > 0) { - log.info("[PDD] detail.get backfill applied erpGoodsId={} pddGoodsId={} skuRowsUpdated={}", - erpGoodsId, pddGoodsId, fromDetailCount); - } else if (anySkuMissingPddSkuId(erpGoodsId)) { - log.warn("[PDD] detail.get ok but no sku_id matched outer_erp_sku_id erpGoodsId={} pddGoodsId={}", - erpGoodsId, pddGoodsId); - } } /** @@ -140,39 +109,6 @@ public class OGoodsPddMappingPersistence { return updated; } - private boolean anySkuMissingPddSkuId(Long erpGoodsId) { - List rows = skuService.list(new LambdaQueryWrapper() - .eq(OGoodsSku::getGoodsId, erpGoodsId)); - if (rows == null || rows.isEmpty()) { - return false; - } - for (OGoodsSku row : rows) { - if (row == null || !StringUtils.hasText(row.getOuterErpSkuId())) { - continue; - } - Long v = readCanonicalLong(row.getCanonicalExt(), CANONICAL_PDD_SKU_ID); - if (v == null || v <= 0) { - return true; - } - } - return false; - } - - private static Long readCanonicalLong(String json, String key) { - if (!StringUtils.hasText(json) || !StringUtils.hasText(key)) { - return null; - } - try { - JSONObject o = JSON.parseObject(json); - if (o == null || !o.containsKey(key)) { - return null; - } - return o.getLong(key); - } catch (Exception e) { - return null; - } - } - private static String mergeJsonLongField(String existingJson, String field, long value) { JSONObject o; if (StringUtils.hasText(existingJson)) { diff --git a/service/src/main/java/cn/qihangerp/service/external/pdd/PddOpenApiSupport.java b/service/src/main/java/cn/qihangerp/service/external/pdd/PddOpenApiSupport.java index 19f1d1e0..b61595cc 100644 --- a/service/src/main/java/cn/qihangerp/service/external/pdd/PddOpenApiSupport.java +++ b/service/src/main/java/cn/qihangerp/service/external/pdd/PddOpenApiSupport.java @@ -199,7 +199,7 @@ public final class PddOpenApiSupport { /** * 从 {@code pdd.goods.detail.get} 成功响应中解析 {@code goods_detail_get_response.sku_list[]}， * 与 {@link #parseOuterKeyToPddSkuIdFromGoodsAddResponse} 对齐：按 {@code out_sku_sn}/{@code outer_id}/{@code out_sku_id} 映射拼多多 {@code sku_id}。 - *

用于 {@code INFORMATION_UPDATE} 等未返回 {@code goods_add_response.sku_list} 的发品路径之后，在 ERP 本地补全 {@code o_goods_sku.canonicalExt.pddSkuId}。

+ *

供调用方（如主数据在拉 {@code /external/pdd/goods/detail} 后）解析 SKU 映射；ERP-Open 发品/更新成功后不再自动调 detail 写 {@code o_goods_sku}。

*/ public static Map parseOuterKeyToPddSkuIdFromGoodsDetailGetResponse(String raw) { Map out = new LinkedHashMap<>();