From 98c7c508c05c765838a4a3318423ff9627b46e17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 九月 2019 10:38:23 +0800
Subject: [PATCH] 自购立减商品规则添加

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
index edc36eb..cdad78e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java
@@ -252,13 +252,25 @@
 	public List<DaTaoKeDetailV2> listPreTLJBuyGoods(int page) {
 		if (page == 1) {
 			List<DaTaoKeDetailV2> listPreGoodsList = new ArrayList<>();
+			// 鐑攢姒�
 			DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_HOT, null);
 			if (result != null && result.getGoodsList() != null)
 				listPreGoodsList.addAll(result.getGoodsList());
-
+			// 澶嶈喘姒�
 			result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_REBUY, null);
 			if (result != null && result.getGoodsList() != null)
 				listPreGoodsList.addAll(result.getGoodsList());
+			// 缁煎悎鎼滅储
+			try {
+				result = DaTaoKeApiUtil.search("", null, null, null, 1, 200, DaTaoKeApiUtil.SORT_DEFAULT);
+				if (result == null)
+					throw new Exception();
+			} catch (Exception e) {// 寮傚父閲嶅涓�娆�
+				result = DaTaoKeApiUtil.search("", null, null, null, 1, 200, DaTaoKeApiUtil.SORT_DEFAULT);
+			}
+
+			if (result != null && result.getGoodsList() != null)
+				listPreGoodsList.addAll(result.getGoodsList());
 
 			List<DaTaoKeDetailV2> goodsList = new ArrayList<>();
 			for (DaTaoKeDetailV2 v2 : listPreGoodsList) {

--
Gitblit v1.8.0