From 2d3afb55aed07f9780ab46aefbdc7d520cdff576 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 十一月 2019 15:44:22 +0800
Subject: [PATCH] 品牌排序

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java |   67 ++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 22 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 ede5a43..694aaae 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
@@ -49,16 +49,19 @@
 	
 	
 	@Override
-	public int addBrandGoods(BrandInfo brandInfo) {
-		int count = 0;
+	public BrandInfo addBrandGoods(BrandInfo brandInfo) {
 		// 娣樺疂
-		count += addBrandGoodsTB(brandInfo);
+		BrandInfo goodsTB = addBrandGoodsTB(brandInfo);
 		// 浜笢
-		count += addBrandGoodsJD(brandInfo);
+		BrandInfo goodsJD = addBrandGoodsJD(brandInfo);
 		// 鎷煎澶�
-		count += addBrandGoodsPDD(brandInfo);
+		BrandInfo goodsPDD = addBrandGoodsPDD(brandInfo);
 		
-		return count;
+		int goodsTotal = goodsTB.getGoodsTotal() + goodsJD.getGoodsTotal() +  goodsPDD.getGoodsTotal();
+		int shopTotal = goodsTB.getShopTotal() + goodsJD.getShopTotal() +  goodsPDD.getShopTotal();
+		goodsTB.setGoodsTotal(goodsTotal);
+		goodsTB.setShopTotal(shopTotal);
+		return goodsTB;
 	}
 	
 	
@@ -67,16 +70,19 @@
 	 * @param brandInfo
 	 * @return
 	 */
-	private int addBrandGoodsTB(BrandInfo brandInfo) {
+	private BrandInfo addBrandGoodsTB(BrandInfo brandInfo) {
+		BrandInfo numInfo = new BrandInfo();
 		Date date = new Date();
 		String shopKey = brandInfo.getShopKey();
 		if (StringUtil.isNullOrEmpty(shopKey)) {
 			// 鍒犻櫎涔嬪墠鐨�
 		    brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1 , date);
-		    
 			// 鍒犻櫎搴楅摵
 		    brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
-			return 0;
+		    
+		    numInfo.setShopTotal(0);
+		    numInfo.setGoodsTotal(0);
+			return numInfo;
 		}
 		
 		String searchKey = brandInfo.getSearchKey();
@@ -96,6 +102,7 @@
 	    
 	    // 缁勭粐鍟嗗搧 + 娣诲姞搴楅摵
 		int count = 0;
+		int countShop = 0;
 		if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null 
 				&& searchResult.getTaoBaoGoodsBriefs().size() > 0) {
 			boolean addShop = true;
@@ -107,6 +114,9 @@
 						&& shopTitle.toLowerCase().contains(shopKey.toLowerCase())) {
 					addShop = brandShopCaheService.addBrandShopTB(brandInfo, goods.getAuctionId(),
 							goods.getSellerId());
+					
+					if (!addShop) 
+						countShop = 1;
 				}
 				
 				// 娣诲姞鍟嗗搧
@@ -116,7 +126,7 @@
 					brandGoods.setWeight((int) (Math.random() * 1000));
 					brandGoods.setGoodsType(1);
 					brandGoods.setGoodsTB(goods);
-					brandGoods.setCreateTime(date);
+					brandGoods.setCreateTime(new Date());
 					brandGoodsCaheDao.insert(brandGoods);
 					count ++;
 				} else if (!addShop) {
@@ -128,7 +138,9 @@
 		// 鍒犻櫎涔嬪墠鐨�
 	    brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1 , date);
 	    
-		return count;
+	    numInfo.setShopTotal(countShop);
+	    numInfo.setGoodsTotal(count);
+		return numInfo;
 	}
 	
 	
@@ -138,7 +150,8 @@
 	 * @param brandInfo
 	 * @return
 	 */
-	private int addBrandGoodsJD(BrandInfo brandInfo) {
+	private BrandInfo addBrandGoodsJD(BrandInfo brandInfo) {
+		BrandInfo numInfo = new BrandInfo();
 		Date date = new Date();
 		String shopKey = brandInfo.getShopKeyJD();
 		if (StringUtil.isNullOrEmpty(shopKey)) {
@@ -146,7 +159,9 @@
 		    brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
 			// 鍒犻櫎涔嬪墠
 		    brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2 , date);
-		    return 0;
+		    numInfo.setShopTotal(0);
+		    numInfo.setGoodsTotal(0);
+		    return numInfo;
 		}
 		
 		String searchKey = brandInfo.getSearchKeyJD();
@@ -154,6 +169,7 @@
 			searchKey = brandInfo.getName();
 		
 		int count = 0;
+		int countShop = 0;
 		JDSearchResult result = null;
 		String way = configService.get("jd_api_search_key");
 		
@@ -190,7 +206,7 @@
 					brandGoods.setWeight((int) (Math.random() * 1000));
 					brandGoods.setGoodsJD(goods);
 					brandGoods.setGoodsType(2);
-					brandGoods.setCreateTime(date);
+					brandGoods.setCreateTime(new Date());
 					brandGoodsCaheDao.insert(brandGoods);
 					
 					JDShopInfo shopInfo = goods.getShopInfo();
@@ -200,6 +216,7 @@
 						if (!StringUtil.isNullOrEmpty(shopName) && shopName.toLowerCase().contains(shopKey.toLowerCase())) {
 							addShop = false;
 							brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);
+							countShop = 1;
 						}
 					}
 					
@@ -210,11 +227,12 @@
 				}
 			}
 		}
-		
 		// 鍒犻櫎涔嬪墠
 	    brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2 , date);
-				
-  		return count;
+	    
+	    numInfo.setShopTotal(countShop);
+	    numInfo.setGoodsTotal(count);
+		return numInfo;	
 	}
 	
 	
@@ -223,15 +241,18 @@
 	 * @param brandInfo
 	 * @return
 	 */
-	private int addBrandGoodsPDD(BrandInfo brandInfo) {
+	private BrandInfo addBrandGoodsPDD(BrandInfo brandInfo) {
 		Date date = new Date();
+		BrandInfo numInfo = new BrandInfo();
 		String shopKey = brandInfo.getShopKeyPDD();
 		if (StringUtil.isNullOrEmpty(shopKey)) {
 			// 鍒犻櫎涔嬪墠
 			brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
 			// 鍒犻櫎涔嬪墠搴楅摵
 			brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
-			return 0;
+			numInfo.setShopTotal(0);
+		    numInfo.setGoodsTotal(0);
+		    return numInfo;
 		}
 		
 		String searchKey = brandInfo.getSearchKeyPDD();
@@ -256,7 +277,7 @@
 					brandGoods.setWeight((int) (Math.random() * 1000));
 					brandGoods.setGoodsType(3);
 					brandGoods.setGoodsPDD(goods);
-					brandGoods.setCreateTime(date);
+					brandGoods.setCreateTime(new Date());
 					brandGoodsCaheDao.insert(brandGoods);
 					count ++;
 					if (count >= 50) {
@@ -270,9 +291,11 @@
 		// 鍒犻櫎涔嬪墠搴楅摵
 		brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
 		// 娣诲姞搴楅摵
-		brandShopCaheService.addBrandShopPDD(brandInfo);
+		int countShop = brandShopCaheService.addBrandShopPDD(brandInfo);
 		
-		return count;
+		numInfo.setShopTotal(countShop);
+	    numInfo.setGoodsTotal(count);
+		return numInfo;
 	}
 	
 	

--
Gitblit v1.8.0