From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailV2ServiceImpl.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 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 0ebe200..0a8accf 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
@@ -21,6 +21,7 @@
 import com.yeshi.fanli.dao.goods.taobao.dataoke.DaTaoKeGoodsDetailV2Dao;
 import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
 import com.yeshi.fanli.dto.dataoke.DingDongQiangDTO;
+import com.yeshi.fanli.dto.taobao.DaTaoKeFilterResult;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.log.LogHelper;
@@ -159,8 +160,13 @@
 		for (TaoBaoGoodsBrief goods : goodsList)
 			goodsIdList.add(goods.getAuctionId());
 
-		List<DaTaoKeDetailV2> dtList = listByGoodsIds(goodsIdList);
+		List<DaTaoKeDetailV2> dtList = null;
 
+		try {
+			dtList = listByGoodsIds(goodsIdList);
+		} catch (Exception e) {
+
+		}
 		Map<Long, DaTaoKeDetailV2> map = new HashMap<>();
 		if (dtList != null)
 			for (DaTaoKeDetailV2 goods : dtList)
@@ -172,20 +178,6 @@
 		return goodsList;
 	}
 
-	@Override
-	public TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods) {
-		List<Long> goodsIdList = new ArrayList<>();
-		goodsIdList.add(goods.getAuctionId());
-
-		List<DaTaoKeDetailV2> daTaoKeList = listByGoodsIds(goodsIdList);
-		if (daTaoKeList == null || daTaoKeList.size() == 0)
-			return goods;
-
-		// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
-		goods = DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0));
-
-		return goods;
-	}
 
 	@Override
 	public List<DaTaoKeDetailV2> listByIds(List<Long> idsList) {
@@ -211,6 +203,8 @@
 
 	@Override
 	public List<DaTaoKeDetailV2> getGoodsNotInList(Long cid, List<Long> listId, int count) {
+		if (cid != null && cid == 0L)
+			cid = null;
 		return daTaoKeGoodsDetailV2Dao.getGoodsNotInList(cid, listId, count);
 	}
 
@@ -440,4 +434,27 @@
 		return daTaoKeGoodsDetailV2Dao.listBySellerId((int) start, count, sellerId);
 	}
 
+	@Override
+	public DaTaoKeDetailV2 selectByAuctionId(Long auctionId) {
+		return daTaoKeGoodsDetailV2Dao.selectByAuctionId(auctionId);
+	}
+
+	@Cacheable(value = "daTaoKeGoodsCache", key = "'selectByAuctionId-'+#auctionId")
+	@Override
+	public DaTaoKeDetailV2 selectByAuctionIdCache(Long auctionId) {
+		return selectByAuctionId(auctionId);
+	}
+
+	@Override
+	public DaTaoKeFilterResult filterTaoBaoGoods(TaoBaoGoodsBrief goods) {
+		List<Long> goodsIdList = new ArrayList<>();
+		goodsIdList.add(goods.getAuctionId());
+
+		List<DaTaoKeDetailV2> daTaoKeList = listByGoodsIds(goodsIdList);
+		if (daTaoKeList == null || daTaoKeList.size() == 0)
+			return new DaTaoKeFilterResult(goods, DaTaoKeFilterResult.FILTER_TYPE_NONE);
+		// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
+		return DaTaoKeUtil.filterTaoBaoGoods(goods, daTaoKeList.get(0), true);
+	}
+
 }

--
Gitblit v1.8.0