From 05ed10ecd5133f4b8e7d32709ffcf9ab0c307ba2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 18:25:43 +0800
Subject: [PATCH] --

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 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 24e2bf6..f3aa30d 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
@@ -10,6 +10,7 @@
 import javax.annotation.Resource;
 
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.taobao.TLJBuyGoodsDao;
@@ -25,6 +26,7 @@
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
@@ -42,13 +44,18 @@
 	@Resource
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
+	@Resource
+	private EhCacheCacheManager ehCacheCacheManager;
+
 	@Override
-	public void addTLJBuyGoods(TLJBuyGoods goods) {
+	public void addTLJBuyGoods(TLJBuyGoods goods, TaoKeAppInfo taoKeAppInfo) {
 		if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)
 			return;
 		goods.setId(StringUtil.Md5(goods.getDay() + "#" + goods.getGoods().getAuctionId()));
 		if (goods.getUpdateTime() == null)
 			goods.setUpdateTime(new Date());
+		if (taoKeAppInfo != null)
+			goods.setAppKey(taoKeAppInfo.getAppKey());
 		tljBuyGoodsDao.save(goods);
 	}
 
@@ -63,8 +70,19 @@
 		List<TLJBuyGoods> list = tljBuyGoodsDao.listByDayOrderByUpdateTime(day, 1, count);
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		if (list != null) {
-			for (TLJBuyGoods shg : list)
+			for (TLJBuyGoods shg : list) {
+				// 璁$畻鎺ㄥ箍绾㈠寘
+				BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(shg.getGoods(),
+						TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+				BigDecimal finalPrice = TaoBaoUtil.getAfterUseCouplePrice(shg.getGoods());
+
+				// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1,浠锋牸涓嶈兘澶т簬30
+				if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0 || finalPrice.compareTo(new BigDecimal(30)) >= 0) {
+					continue;
+				}
+
 				goodsList.add(shg.getGoods());
+			}
 		}
 		// 杩囨护涓嬬嚎鍟嗗搧
 		goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
@@ -128,9 +146,43 @@
 
 	@Override
 	public void updateGoods(TaoBaoGoodsBrief goods) {
+		if (goods == null)
+			return;
 		List<TLJBuyGoods> list = tljBuyGoodsDao.listByAuctionId(goods.getAuctionId());
+		// 鏌ヨ鑷喘绔嬪噺鏄惁灏忎簬1鍏�
+		BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+		// if (money.compareTo(new BigDecimal(1)) < 0) {// 鍒犻櫎鍟嗗搧
+		// if (list != null)
+		// for (TLJBuyGoods tljGoods : list) {
+		// tljBuyGoodsDao.delete(tljGoods.getId());
+		// }
+		// }
+
 		if (list != null)
 			for (TLJBuyGoods TLJBuyGoods : list) {
+
+				if (goods.getCouponInfo() == null)
+					goods.setCouponInfo("");
+				if (goods.getCouponAmount() == null)
+					goods.setCouponAmount(new BigDecimal(0));
+
+				// 鍒ゆ柇 鍒镐俊鎭� 浠锋牸淇℃伅 杩斿埄姣斾緥淇℃伅鏄惁鏀瑰彉
+				boolean change = false;
+				if (goods.getZkPrice().compareTo(TLJBuyGoods.getGoods().getZkPrice()) != 0)
+					change = true;
+				if (goods.getCouponAmount().compareTo(TLJBuyGoods.getGoods().getCouponAmount()) != 0)
+					change = true;
+				if (!goods.getCouponInfo().equalsIgnoreCase(TLJBuyGoods.getGoods().getCouponInfo()))
+					change = true;
+				if (goods.getTkRate().compareTo(TLJBuyGoods.getGoods().getTkRate()) != 0)
+					change = true;
+
+				if (change) {
+					// 娓呴櫎鍒楄〃缂撳瓨
+					ehCacheCacheManager.getCache("commonContentCache").evict(
+							"tljBuy-listByDay" + TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+				}
+
 				// 鏇存柊鍒镐俊鎭� 锛屼环鏍间俊鎭紝閿�閲忎俊鎭�
 				TLJBuyGoods.getGoods().setZkPrice(goods.getZkPrice());
 				TLJBuyGoods.getGoods().setCouponAmount(goods.getCouponAmount());
@@ -141,6 +193,7 @@
 				TLJBuyGoods.getGoods().setCouponStartFee(goods.getCouponStartFee());
 				TLJBuyGoods.getGoods().setCouponTotalCount(goods.getCouponTotalCount());
 				TLJBuyGoods.getGoods().setBiz30day(goods.getBiz30day());
+				TLJBuyGoods.getGoods().setTkRate(goods.getTkRate());
 				tljBuyGoodsDao.save(TLJBuyGoods);
 			}
 	}

--
Gitblit v1.8.0