From f38e508d334ae03024f0dce0d1fb6baed212dc24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 26 九月 2019 15:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandShopCaheServiceImpl.java | 9 ++++++---
1 files changed, 6 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 b1dd1fb..4351f19 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
@@ -85,10 +85,13 @@
*/
@Override
public void addBrandShopPDD(BrandInfo brandInfo) {
+ String searchKey = brandInfo.getSearchKey();
+ 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);
@@ -99,7 +102,7 @@
if (goodsList != null && goodsList.size() > 0) {
for (PDDGoodsDetail goods : goodsList) {
String mallName = goods.getMallName();
- if(goods.getMallId() != null && !StringUtil.isNullOrEmpty(mallName) && mallName.contains(key)){
+ if(goods.getMallId() != null && !StringUtil.isNullOrEmpty(mallName) && mallName.contains(brandInfo.getName())){
shopInfoVO = new ShopInfoVO();
shopInfoVO.setId(goods.getMallId().toString());
shopInfoVO.setShopName(mallName);
--
Gitblit v1.8.0