From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 5bb3509..9161b4a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -1334,14 +1334,14 @@
if (jdGoodsList.size() > 0) {
List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
for (JDGoods goods : goodsList) {
- tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,
GoodsDetailVOFactory.convertJDGoods(goods, params));
}
}
if (pddGoodsList.size() > 0) {
List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);
for (PDDGoodsDetail goods : goodsList) {
- tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_PDD,
GoodsDetailVOFactory.convertPDDGoods(goods, params));
}
}
--
Gitblit v1.8.0