From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
index 8d011b6..324f8c3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -10,6 +11,7 @@
import javax.annotation.Resource;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.cache.ehcache.EhCacheCacheManager;
import org.springframework.stereotype.Service;
@@ -67,6 +69,8 @@
goods.setUpdateTime(new Date());
if (taoKeAppInfo != null)
goods.setAppKey(taoKeAppInfo.getAppKey());
+ if (goods.getWeight() == null)
+ goods.setWeight(1);
tljBuyGoodsDao.save(goods);
}
@@ -97,7 +101,7 @@
// 杩囨护娣樼ぜ閲戝ぇ浜�10鍧楅挶鐨�
BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),
TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
- if (hongBao.compareTo(new BigDecimal(10)) > 0) {
+ if (hongBao.compareTo(new BigDecimal(20)) > 0) {
list.remove(i--);
}
}
@@ -106,6 +110,14 @@
goodsList.addAll(list);
}
Collections.shuffle(goodsList);
+ Comparator<TLJBuyGoods> cm = new Comparator<TLJBuyGoods>() {
+
+ @Override
+ public int compare(TLJBuyGoods o1, TLJBuyGoods o2) {
+ return o1.getWeight() != null && o2.getWeight() != null ? o2.getWeight() - o1.getWeight() : 0;
+ }
+ };
+ Collections.sort(goodsList, cm);
return goodsList;
}
@@ -259,6 +271,9 @@
@Override
public void removeGoods(Long auctionId) {
tljBuyGoodsDao.deleteByAuctionId(auctionId);
+ // 娓呴櫎鍒楄〃缂撳瓨
+ ehCacheCacheManager.getCache("commonContentCache")
+ .evict("tljBuy-listByDay" + TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
}
}
\ No newline at end of file
--
Gitblit v1.8.0