From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 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 dac16bf..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
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.impl.jd;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -143,7 +144,7 @@
 			if (result == null) {
 				return null;
 			} else {
-				return result.getGoodsList();
+				return filterJDGoods(result.getGoodsList());
 			}
 		}
 
@@ -163,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) {
@@ -207,6 +225,9 @@
 			jdfilter.setPageSize(Constant.PAGE_SIZE);
 			result = JDUtil.searchByKey(jdfilter);
 		}
+		if (result != null && result.getGoodsList() != null)
+			Collections.shuffle(result.getGoodsList());
+
 		return result;
 	}
 

--
Gitblit v1.8.0