From bf5d1b405c759de3faa42af37b1f10f42823b105 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/RecommendGoodsDeleteHistoryServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/RecommendGoodsDeleteHistoryServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/RecommendGoodsDeleteHistoryServiceImpl.java
index 46eb4f9..b65e426 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/RecommendGoodsDeleteHistoryServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/RecommendGoodsDeleteHistoryServiceImpl.java
@@ -1,14 +1,22 @@
package com.yeshi.fanli.service.impl.goods.recommend;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import com.qcloud.cos.model.ListMultipartUploadsRequest;
import com.yeshi.fanli.dao.mybatis.goods.recommend.RecommendGoodsDeleteHistoryMapper;
import com.yeshi.fanli.entity.goods.recommend.RecommendGoodsDeleteHistory;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -27,4 +35,28 @@
recommendGoodsDeleteHistoryMapper.insertSelective(history);
}
+ @Override
+ public List<TaoBaoGoodsBrief> filterGoods(String device, List<TaoBaoGoodsBrief> goodsList) {
+ List<TaoBaoGoodsBrief> resultList = new ArrayList<>();
+ if (goodsList == null || goodsList.size() == 0)
+ return goodsList;
+
+ Map<Long, TaoBaoGoodsBrief> resultMap = new ConcurrentHashMap<>();
+ List<RecommendGoodsDeleteHistory> hlist = new ArrayList<>();
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ hlist.add(new RecommendGoodsDeleteHistory(goods.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO));
+ resultMap.put(goods.getAuctionId(), goods);
+ }
+ List<RecommendGoodsDeleteHistory> existList = recommendGoodsDeleteHistoryMapper.listByGoodsInfo(device, hlist);
+ if (existList != null)
+ for (RecommendGoodsDeleteHistory dh : existList)
+ resultMap.remove(dh.getGoodsId());
+
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ if (resultMap.get(goods.getAuctionId()) != null)
+ resultList.add(resultMap.get(goods.getAuctionId()));
+ }
+ return resultList;
+ }
+
}
--
Gitblit v1.8.0