Authored by 胡古飞

fix shopsNew接口

@@ -288,7 +288,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl @@ -288,7 +288,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
288 288
289 // 3、查询店铺和全球购品牌 289 // 3、查询店铺和全球购品牌
290 SearchApiResult shopListApiResult = shopListService.searchShopList(paramMap); 290 SearchApiResult shopListApiResult = shopListService.searchShopList(paramMap);
291 - if (shopListApiResult != null) { 291 + if (shopListApiResult == null) {
292 JSONObject jsonObject = (JSONObject) shopListApiResult.getData(); 292 JSONObject jsonObject = (JSONObject) shopListApiResult.getData();
293 JSONArray shop_list = jsonObject.getJSONArray("shop_list"); 293 JSONArray shop_list = jsonObject.getJSONArray("shop_list");
294 for (int i = 0; i < shop_list.size(); i++) { 294 for (int i = 0; i < shop_list.size(); i++) {
@@ -304,10 +304,11 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl @@ -304,10 +304,11 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
304 return searchApiResult.setData(returnMap); 304 return searchApiResult.setData(returnMap);
305 } 305 }
306 } 306 }
307 - } else {  
308 - returnMap.put("tblBrand", this.getYohoBrand(paramMap));  
309 - return searchApiResult.setData(returnMap);  
310 } 307 }
  308 + // 4、获取有货品牌信息
  309 + returnMap.put("brand", this.getYohoBrand(paramMap));
  310 +
  311 + //5、返回结果
311 return searchApiResult.setData(returnMap); 312 return searchApiResult.setData(returnMap);
312 } catch (Exception e) { 313 } catch (Exception e) {
313 return SearchApiResultUtils.errorSearchApiResult("searchShopsNew", paramMap, e); 314 return SearchApiResultUtils.errorSearchApiResult("searchShopsNew", paramMap, e);