From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 16:01:58 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
index ddd5e73..b623070 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
@@ -144,7 +144,7 @@
 			if (result == null) {
 				return null;
 			} else {
-				return result.getGoodsList();
+				return filterJDGoods(result.getGoodsList());
 			}
 		}
 
@@ -164,7 +164,24 @@
 				list.addAll(listGoods);
 			}
 		}
-		return list;
+		return filterJDGoods(list);
+	}
+
+	/**
+	 * 杩囨护鍟嗗搧
+	 * 
+	 * @param goodsList
+	 * @return
+	 */
+	private List<JDGoods> filterJDGoods(List<JDGoods> goodsList) {
+		List<Long> skuIds = new ArrayList<>();
+		for (JDGoods goods : goodsList) {
+			skuIds.add(goods.getSkuId());
+		}
+		List<JDGoods> newGoodsList = JDApiUtil.listGoodsDetail(skuIds);
+		if (newGoodsList != null && newGoodsList.size() > 0)
+			return newGoodsList;
+		return goodsList;
 	}
 
 	private List<JDGoods> search(int page, int pageSize, String jdcid) {

--
Gitblit v1.8.0