From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java |  100 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 66 insertions(+), 34 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 94f3297..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
@@ -22,7 +22,7 @@
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.activity.ActivityService;
+import com.yeshi.fanli.service.inter.activity.ActivityGoodsUpdateService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
@@ -38,7 +38,7 @@
 public class TaoBaoGoodsUpdateServiceImpl implements TaoBaoGoodsUpdateService {
 
 	@Resource
-	private ActivityService activityService;
+	private ActivityGoodsUpdateService activityGoodsUpdateService;
 
 	@Resource
 	private QualityFactoryGoodsUpdateService qualityFactoryGoodsUpdateService;
@@ -99,7 +99,7 @@
 	@Override
 	public void offlineTaoBaoGoods(Long auctionId) {
 		// 鏇存柊鍔ㄦ�佹暟鎹�
-		activityService.downTaoBaoGoods(auctionId);
+		activityGoodsUpdateService.downTaoBaoGoods(auctionId);
 
 		// 鍒犻櫎绮鹃�夊簱鐩稿叧鐨勬暟鎹�
 		qualityFactoryGoodsUpdateService.deleteByTaoBaoGoodsId(auctionId);
@@ -141,7 +141,7 @@
 		}
 
 		// 鏇存柊鍔ㄦ�佸晢鍝�
-		activityService.updateRecommendActivityGoods(goods);
+		activityGoodsUpdateService.updateRecommendActivityGoods(goods);
 
 		// 鏇存柊鍒嗕韩搴撶殑鍟嗗搧
 		shareHotGoodsService.updateShareGoods(goods);
@@ -263,7 +263,7 @@
 			taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods);
 
 			// 鏇存柊鍔ㄦ�佸晢鍝�
-			activityService.updateRecommendActivityGoods(newGoods);
+			activityGoodsUpdateService.updateRecommendActivityGoods(newGoods);
 
 			// 鏇存柊鏀惰棌淇℃伅
 			try {
@@ -329,40 +329,72 @@
 	}
 
 	@Override
-	public List<TaoBaoGoodsBrief> filterTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) {
-		Map<Long, TaoBaoGoodsBrief> finalMap = new HashMap<>();
-		// 鍘熷鏁版嵁鍏ㄨ鐩�
-		for (TaoBaoGoodsBrief goods : goodsList) {
-			finalMap.put(goods.getAuctionId(), goods);
-		}
+	public List<TaoBaoGoodsBrief> filterImportantTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) {
 
-		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--);
-			}
-		}
-
-		// 鍐嶄粠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) {
+		// 鍟嗗搧杩囨护涓嶅厑璁稿嚭閿�
+		try {
+			Map<Long, TaoBaoGoodsBrief> finalMap = new HashMap<>();
+			// 鍘熷鏁版嵁鍏ㄨ鐩�
+			for (TaoBaoGoodsBrief goods : goodsList) {
 				finalMap.put(goods.getAuctionId(), goods);
 			}
 
-		List<TaoBaoGoodsBrief> finalList = new ArrayList<>();
-		for (TaoBaoGoodsBrief goods : goodsList)
-			finalList.add(finalMap.get(goods.getAuctionId()));
+			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--);
+				}
+			}
 
-		return finalList;
+			// 鍐嶄粠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);
+				}
+
+			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 goodsList;
+	}
+
+	@Override
+	public int listAndRemoveByMaxUpdateTime(Date maxTime, int page, int pageSize) {
+		return taoBaoGoodsUpdateDao.listAndRemoveByMaxUpdateTime(maxTime, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long countByMaxUpdateTime(Date maxTime) {
+		return taoBaoGoodsUpdateDao.countByMaxUpdateTime(maxTime);
+
 	}
 
 }

--
Gitblit v1.8.0