From 8e751a7ee99afce71ac615a6111228c5c785ee46 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 14 八月 2019 09:52:59 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java | 82 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
index 73f70b7..cf4f8f2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
@@ -330,52 +330,60 @@
@Override
public List<TaoBaoGoodsBrief> filterImportantTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) {
- Map<Long, TaoBaoGoodsBrief> finalMap = new HashMap<>();
- // 鍘熷鏁版嵁鍏ㄨ鐩�
- for (TaoBaoGoodsBrief goods : goodsList) {
- finalMap.put(goods.getAuctionId(), goods);
- }
- List<TaoBaoGoodsBrief> tempGoodsList = new ArrayList<>();
- tempGoodsList.addAll(goodsList);
- // 鍏堜粠redis閲岄潰鍙栬鐩�
- for (int i = 0; i < tempGoodsList.size(); i++) {
- TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(tempGoodsList.get(i).getAuctionId());
- if (goods != null) {
+ // 鍟嗗搧杩囨护涓嶅厑璁稿嚭閿�
+ try {
+ Map<Long, TaoBaoGoodsBrief> finalMap = new HashMap<>();
+ // 鍘熷鏁版嵁鍏ㄨ鐩�
+ for (TaoBaoGoodsBrief goods : goodsList) {
finalMap.put(goods.getAuctionId(), goods);
- tempGoodsList.remove(i--);
}
- }
- // 鍐嶄粠mongodb涓彇瑕嗙洊
- List<Long> auctionIds = new ArrayList<>();
- for (TaoBaoGoodsBrief goods : tempGoodsList) {
- auctionIds.add(goods.getAuctionId());
- }
- List<TaoBaoGoodsBrief> mList = taoBaoGoodsUpdateDao.listByAuctionIds(auctionIds);
- if (mList != null)
- for (TaoBaoGoodsBrief goods : mList) {
- if (goods.getUpdatetime().getTime() > System.currentTimeMillis() - 1000 * 60 * 60 * 24L)// 鍦�1澶╁唴鏇存柊鐨勬暟鎹墠鍙備笌杩囨护
+ List<TaoBaoGoodsBrief> tempGoodsList = new ArrayList<>();
+ tempGoodsList.addAll(goodsList);
+ // 鍏堜粠redis閲岄潰鍙栬鐩�
+ for (int i = 0; i < tempGoodsList.size(); i++) {
+ TaoBaoGoodsBrief goods = taoBaoGoodsCacheUtil
+ .getCommonTaoBaoGoodsInfo(tempGoodsList.get(i).getAuctionId());
+ if (goods != null) {
finalMap.put(goods.getAuctionId(), goods);
+ tempGoodsList.remove(i--);
+ }
}
- List<TaoBaoGoodsBrief> finalList = new ArrayList<>();
- for (TaoBaoGoodsBrief goods : goodsList) {
- TaoBaoGoodsBrief newGoods = finalMap.get(goods.getAuctionId());
- // 杩囨护浠锋牸锛岃繑鍒╂瘮渚嬶紝鍒镐俊鎭�
- goods.setZkPrice(newGoods.getZkPrice());
- goods.setTkRate(newGoods.getTkRate());
- goods.setCouponAmount(goods.getCouponAmount());
- goods.setCouponActivityId(newGoods.getCouponActivityId());
- goods.setCouponEffectiveEndTime(newGoods.getCouponEffectiveEndTime());
- goods.setCouponEffectiveStartTime(newGoods.getCouponEffectiveStartTime());
- goods.setCouponStartFee(newGoods.getCouponStartFee());
- goods.setCouponTotalCount(newGoods.getCouponTotalCount());
- goods.setCouponLeftCount(newGoods.getCouponLeftCount());
+ // 鍐嶄粠mongodb涓彇瑕嗙洊
+ List<Long> auctionIds = new ArrayList<>();
+ for (TaoBaoGoodsBrief goods : tempGoodsList) {
+ auctionIds.add(goods.getAuctionId());
+ }
+ List<TaoBaoGoodsBrief> mList = taoBaoGoodsUpdateDao.listByAuctionIds(auctionIds);
+ if (mList != null)
+ for (TaoBaoGoodsBrief goods : mList) {
+ if (goods.getUpdatetime().getTime() > System.currentTimeMillis() - 1000 * 60 * 60 * 24L)// 鍦�1澶╁唴鏇存柊鐨勬暟鎹墠鍙備笌杩囨护
+ finalMap.put(goods.getAuctionId(), goods);
+ }
- finalList.add(goods);
+ List<TaoBaoGoodsBrief> finalList = new ArrayList<>();
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ TaoBaoGoodsBrief newGoods = finalMap.get(goods.getAuctionId());
+ // 杩囨护浠锋牸锛岃繑鍒╂瘮渚嬶紝鍒镐俊鎭�
+ goods.setZkPrice(newGoods.getZkPrice());
+ goods.setTkRate(newGoods.getTkRate());
+ goods.setCouponAmount(newGoods.getCouponAmount());
+ goods.setCouponActivityId(newGoods.getCouponActivityId());
+ goods.setCouponEffectiveEndTime(newGoods.getCouponEffectiveEndTime());
+ goods.setCouponEffectiveStartTime(newGoods.getCouponEffectiveStartTime());
+ goods.setCouponStartFee(newGoods.getCouponStartFee());
+ goods.setCouponTotalCount(newGoods.getCouponTotalCount());
+ goods.setCouponLeftCount(newGoods.getCouponLeftCount());
+
+ finalList.add(goods);
+ }
+ return finalList;
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
- return finalList;
+ return goodsList;
}
@Override
--
Gitblit v1.8.0