From e068c9acf06cff7673fadfca686128f6d6d66e20 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:12:57 +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 | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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 b538a55..73f70b7 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
@@ -23,7 +23,6 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityGoodsUpdateService;
-import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
@@ -330,7 +329,7 @@
}
@Override
- public List<TaoBaoGoodsBrief> filterTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) {
+ public List<TaoBaoGoodsBrief> filterImportantTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) {
Map<Long, TaoBaoGoodsBrief> finalMap = new HashMap<>();
// 鍘熷鏁版嵁鍏ㄨ鐩�
for (TaoBaoGoodsBrief goods : goodsList) {
@@ -356,14 +355,38 @@
List<TaoBaoGoodsBrief> mList = taoBaoGoodsUpdateDao.listByAuctionIds(auctionIds);
if (mList != null)
for (TaoBaoGoodsBrief goods : mList) {
- finalMap.put(goods.getAuctionId(), goods);
+ 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)
- finalList.add(finalMap.get(goods.getAuctionId()));
+ 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());
+ finalList.add(goods);
+ }
return finalList;
}
+ @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