From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java |   87 +++++++++++++++++++++++++++----------------
 1 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
index b1dd1fb..12a0345 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java
@@ -38,21 +38,19 @@
 	 * @return
 	 */
 	@Override
-	public boolean addBrandShopTB(Long brandId, Long auctionId, Long sellerId) {
+	public boolean addBrandShopTB(BrandInfo brandInfo, Long auctionId, Long sellerId) {
 		TaoBaoShop taoBaoShop = taoBaoShopService.getTaoBaoShop(auctionId, sellerId);
 		if (taoBaoShop == null)
 			return true;
 		
-		Date date = new Date();
+		ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop);
+		shopInfoVO.setShopIcon(brandInfo.getIcon());
+		
 		BrandShopCahe brandShop = new BrandShopCahe();
-		brandShop.setBrandId(brandId);
-		brandShop.setShop(ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop));
-		brandShop.setCreateTime(date);
+		brandShop.setBrandId(brandInfo.getId());
+		brandShop.setShop(shopInfoVO);
+		brandShop.setCreateTime(new Date());
 		brandShopCaheDao.insert(brandShop);
-		
-		// 鍒犻櫎搴楅摵
-		brandShopCaheDao.removeByDate(brandId, 11, date);
-		
 		return false;
 	}
 	
@@ -65,16 +63,14 @@
 	 */
 	@Override
 	public void addBrandShopJD(BrandInfo brandInfo, JDShopInfo shopInfo) {
-		Date date = new Date();
 		ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertJDShop(shopInfo);
 		shopInfoVO.setShopIcon(brandInfo.getIcon());
+		
 		BrandShopCahe brandShop = new BrandShopCahe();
 		brandShop.setBrandId(brandInfo.getId());
 		brandShop.setShop(shopInfoVO);
-		brandShop.setCreateTime(date);
-		brandShopCaheDao.save(brandShop);
-		
-		brandShopCaheDao.removeByDate(brandInfo.getId(), 20, date);
+		brandShop.setCreateTime(new Date());
+		brandShopCaheDao.insert(brandShop);
 	}
 	
 	
@@ -84,46 +80,53 @@
 	 * @return
 	 */
 	@Override
-	public void addBrandShopPDD(BrandInfo brandInfo) {
+	public int addBrandShopPDD(BrandInfo brandInfo) {
+		String shopKey = brandInfo.getShopKeyPDD();
+		if (StringUtil.isNullOrEmpty(shopKey))
+			return 0;
+		
+		String searchKey = brandInfo.getSearchKeyPDD();
+		if (StringUtil.isNullOrEmpty(searchKey))
+			searchKey = brandInfo.getName();
+		
 		ShopInfoVO shopInfoVO = null;
-		String key = brandInfo.getName();
 		PDDSearchFilter pddfilter = new PDDSearchFilter();
-		pddfilter.setKw(key);
+		pddfilter.setKw(searchKey);
 		pddfilter.setPage(1);
 		pddfilter.setPageSize(100);
 		pddfilter.setSortType(6);
 		pddfilter.setMerchantType(3);
+		
 		PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
-		if (result != null) {
+		if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
+			boolean addShop = true;
 			List<PDDGoodsDetail> goodsList = result.getGoodsList();
-			if (goodsList != null && goodsList.size() > 0) {
-				for (PDDGoodsDetail goods : goodsList) {
-					String mallName = goods.getMallName();
-					if(goods.getMallId() != null && !StringUtil.isNullOrEmpty(mallName) && mallName.contains(key)){
-						shopInfoVO = new ShopInfoVO();
-						shopInfoVO.setId(goods.getMallId().toString());
-						shopInfoVO.setShopName(mallName);
-						break;
-					}
+			for (PDDGoodsDetail goods : goodsList) {
+				// 鍖呭惈搴楅摵id 銆佸寘鍚搧鐗屽悕绉�
+				String mallName = goods.getMallName();
+				if(addShop && !StringUtil.isNullOrEmpty(mallName) && mallName.toLowerCase().contains(shopKey.toLowerCase()) 
+						&& goods.getMallId() != null){
+					shopInfoVO = new ShopInfoVO();
+					shopInfoVO.setId(goods.getMallId().toString());
+					shopInfoVO.setShopName(mallName);
+					addShop = false;
+					break;
 				}
 			}
 		}
-		
 		
 		if (shopInfoVO != null) {
 			shopInfoVO.setShopIcon(brandInfo.getIcon());
 			shopInfoVO.setUserType(30);
 			shopInfoVO.setShopLink("https://mobile.yangkeduo.com/mall_page.html?mall_id=" + shopInfoVO.getId());
-			
-			Date date = new Date();			
 			BrandShopCahe brandShop = new BrandShopCahe();
 			brandShop.setBrandId(brandInfo.getId());
 			brandShop.setShop(shopInfoVO);
-			brandShop.setCreateTime(date);
+			brandShop.setCreateTime(new Date());
 			brandShopCaheDao.insert(brandShop);
-			
-			brandShopCaheDao.removeByDate(brandInfo.getId(), 30, date);
+			return 1;
 		}
+		return 0;
 	}
 	
 	
@@ -132,4 +135,22 @@
 	public List<BrandShopCahe> getByBrandId(Long brandId){
 		return brandShopCaheDao.getByBrandId(brandId);
 	}
+	
+	
+	@Override
+	public void removeAgoByDate(Date createTime) {
+		brandShopCaheDao.removeAgoByDate(createTime);
+	}
+	
+	@Override
+	public void removeByBrandId(Long brandId) {
+		brandShopCaheDao.removeByBrandId(brandId);
+	}
+	
+	@Override
+	public void removeByDateAndType(Long brandId, int type, Date date) {
+		brandShopCaheDao.removeByDate(brandId, type, date);
+	}
+	
+	
 }

--
Gitblit v1.8.0