From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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 f8c3247..5a7e535 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
@@ -5,6 +5,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.util.Constant;
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.brand.BrandShopCaheDao;
@@ -14,7 +15,7 @@
 import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
 import com.yeshi.fanli.entity.brand.BrandInfo;
 import com.yeshi.fanli.entity.brand.BrandShopCahe;
-import com.yeshi.fanli.entity.taobao.TaoBaoShop;
+import com.yeshi.common.entity.taobao.TaoBaoShop;
 import com.yeshi.fanli.service.inter.brand.BrandShopCaheService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
 import com.yeshi.fanli.util.StringUtil;
@@ -38,14 +39,17 @@
 	 * @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;
 		
+		ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop);
+		shopInfoVO.setShopIcon(brandInfo.getIcon());
+		
 		BrandShopCahe brandShop = new BrandShopCahe();
-		brandShop.setBrandId(brandId);
-		brandShop.setShop(ShopInfoVOFactory.convertTaoBaoShop(taoBaoShop));
+		brandShop.setBrandId(brandInfo.getId());
+		brandShop.setShop(shopInfoVO);
 		brandShop.setCreateTime(new Date());
 		brandShopCaheDao.insert(brandShop);
 		return false;
@@ -62,11 +66,12 @@
 	public void addBrandShopJD(BrandInfo brandInfo, JDShopInfo shopInfo) {
 		ShopInfoVO shopInfoVO = ShopInfoVOFactory.convertJDShop(shopInfo);
 		shopInfoVO.setShopIcon(brandInfo.getIcon());
+		
 		BrandShopCahe brandShop = new BrandShopCahe();
 		brandShop.setBrandId(brandInfo.getId());
 		brandShop.setShop(shopInfoVO);
 		brandShop.setCreateTime(new Date());
-		brandShopCaheDao.save(brandShop);
+		brandShopCaheDao.insert(brandShop);
 	}
 	
 	
@@ -76,8 +81,12 @@
 	 * @return
 	 */
 	@Override
-	public void addBrandShopPDD(BrandInfo brandInfo) {
-		String searchKey = brandInfo.getSearchKey();
+	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();
 		
@@ -89,14 +98,14 @@
 		pddfilter.setSortType(6);
 		pddfilter.setMerchantType(3);
 		
-		PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+		PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter, Constant.PDD_SEARCH_CUSTOMER_PARAMS);
 		if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
 			boolean addShop = true;
 			List<PDDGoodsDetail> goodsList = result.getGoodsList();
 			for (PDDGoodsDetail goods : goodsList) {
 				// 鍖呭惈搴楅摵id 銆佸寘鍚搧鐗屽悕绉�
 				String mallName = goods.getMallName();
-				if(addShop && !StringUtil.isNullOrEmpty(mallName) && mallName.contains(brandInfo.getName()) 
+				if(addShop && !StringUtil.isNullOrEmpty(mallName) && mallName.toLowerCase().contains(shopKey.toLowerCase()) 
 						&& goods.getMallId() != null){
 					shopInfoVO = new ShopInfoVO();
 					shopInfoVO.setId(goods.getMallId().toString());
@@ -116,7 +125,9 @@
 			brandShop.setShop(shopInfoVO);
 			brandShop.setCreateTime(new Date());
 			brandShopCaheDao.insert(brandShop);
+			return 1;
 		}
+		return 0;
 	}
 	
 	

--
Gitblit v1.8.0