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/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
index ac1bf1d..e2794ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
@@ -164,7 +164,10 @@
public List<TaoBaoGoodsBrief> listPreGoods(String key ,int page) {
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 澶ф窐瀹㈢瓫閫夛細 鍒稿悗浠� 1-2鍖洪棿 銆佺患鍚堟帓搴�
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+// DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getGoodsList(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+
+
if (result != null && result.getGoodsList() != null) {
for (DaTaoKeDetailV2 v2 : result.getGoodsList())
goodsList.add(TaoBaoUtil.convert(v2));
--
Gitblit v1.8.0