From 94649b464866dd4f0d544659d43c98ab3e3a08df Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 fe32f59..fe827c0 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
@@ -81,11 +81,11 @@
 	 */
 	@Override
 	public void addBrandShopPDD(BrandInfo brandInfo) {
-		String shopKey = brandInfo.getShopKey();
+		String shopKey = brandInfo.getShopKeyPDD();
 		if (StringUtil.isNullOrEmpty(shopKey))
-			shopKey = brandInfo.getName();
+			return;
 		
-		String searchKey = brandInfo.getSearchKey();
+		String searchKey = brandInfo.getSearchKeyPDD();
 		if (StringUtil.isNullOrEmpty(searchKey))
 			searchKey = brandInfo.getName();
 		

--
Gitblit v1.8.0