From 43ae450db3ce85b425169e4fcef6ac7c25407f52 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:47:37 +0800
Subject: [PATCH] 2.0.2

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java |   79 +++++++++++++++++++++++++--------------
 1 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
index 0391489..6153184 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
@@ -81,6 +81,10 @@
 		filter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
 		TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(filter);
 		
+		// 鍒犻櫎搴楅摵
+	    brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
+	    
+	    // 缁勭粐鍟嗗搧 + 娣诲姞搴楅摵
 		int count = 0;
 		if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null 
 				&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
@@ -110,9 +114,10 @@
 				}
 			}
 		}
+		
 		// 鍒犻櫎涔嬪墠鐨�
 	    brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1 , date);
-		 
+	    
 		return count;
 	}
 	
@@ -132,6 +137,10 @@
 		JDSearchResult result = null;
 		String way = configService.get("jd_api_search_key");
 		Date date = new Date();
+		
+		// 鍒犻櫎搴楅摵
+	    brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
+	    
 		for (int i=0; i < 2;i ++) {
 			if ("1".equals(way)) {
 				JDFilter filterAPI = new JDFilter();
@@ -152,29 +161,31 @@
 				result = JDUtil.searchByKey(jdfilter);
 			}
 			
-			if (result != null) {
+			if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
+				boolean addShop = true;
 				List<JDGoods> goodsList = result.getGoodsList();
-				if (goodsList != null && goodsList.size() > 0) {
-					for (JDGoods goods : goodsList) {
-						BrandGoodsCahe brandGoods = new BrandGoodsCahe();
-						brandGoods.setBrandId(brandInfo.getId());
-						brandGoods.setWeight((int) (Math.random() * 1000));
-						brandGoods.setGoodsJD(goods);
-						brandGoods.setGoodsType(2);
-						brandGoods.setCreateTime(date);
-						brandGoodsCaheDao.insert(brandGoods);
-						
-						if (count == 0) {
-							JDShopInfo shopInfo = goods.getShopInfo();
-							if(shopInfo != null) {
-								brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);
-							}
+				for (JDGoods goods : goodsList) {
+					BrandGoodsCahe brandGoods = new BrandGoodsCahe();
+					brandGoods.setBrandId(brandInfo.getId());
+					brandGoods.setWeight((int) (Math.random() * 1000));
+					brandGoods.setGoodsJD(goods);
+					brandGoods.setGoodsType(2);
+					brandGoods.setCreateTime(date);
+					brandGoodsCaheDao.insert(brandGoods);
+					
+					JDShopInfo shopInfo = goods.getShopInfo();
+					if (addShop && shopInfo != null) {
+						// 鍖呭惈璇ュ搧鐗屽悕绉�
+						String shopName = shopInfo.getShopName();
+						if (!StringUtil.isNullOrEmpty(shopName) && shopName.contains(brandInfo.getName())) {
+							brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);
+							addShop = false;
 						}
-						
-						count ++;
-						if (count >= 50) {
-							break;
-						}
+					}
+					
+					count ++;
+					if (count >= 50) {
+						break;
 					}
 				}
 			}
@@ -202,9 +213,11 @@
 		pddfilter.setPage(1);
 		pddfilter.setPageSize(100);
 		pddfilter.setSortType(6);
-		Date date = new Date();
-		int count = 0;
 		PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+		
+		int count = 0;
+		Date date = new Date();
+		
 		if (result != null) {
 			List<PDDGoodsDetail> goodsList = result.getGoodsList();
 			if (goodsList != null && goodsList.size() > 0) {
@@ -223,14 +236,14 @@
 				}
 			}
 		}
+		// 鍒犻櫎涔嬪墠
+		brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
+		// 鍒犻櫎涔嬪墠搴楅摵
+		brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
 		// 娣诲姞搴楅摵
 		brandShopCaheService.addBrandShopPDD(brandInfo);
 		
-		// 鍒犻櫎涔嬪墠
-		brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
-		
 		return count;
-		
 	}
 	
 	
@@ -243,4 +256,14 @@
 	public long countByBrandId(Long brandId){
 		return brandGoodsCaheDao.countByBrandId(brandId);
 	}
+	
+	@Override
+	public void removeAgoByDate(Date createTime) {
+		brandGoodsCaheDao.removeAgoByDate(createTime);
+	}
+	
+	@Override
+	public void removeByBrandId(Long brandId) {
+		brandGoodsCaheDao.removeByBrandId(brandId);
+	}
 }

--
Gitblit v1.8.0