fix shopsNew接口

@@ -288,7 +288,7 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
 
 			// 3、查询店铺和全球购品牌
 			SearchApiResult shopListApiResult = shopListService.searchShopList(paramMap);
-			if (shopListApiResult != null) {
+			if (shopListApiResult == null) {
 				JSONObject jsonObject = (JSONObject) shopListApiResult.getData();
 				JSONArray shop_list = jsonObject.getJSONArray("shop_list");
 				for (int i = 0; i < shop_list.size(); i++) {
@@ -304,16 +304,17 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
 						return searchApiResult.setData(returnMap);
 					}
 				}
-			} else {
-				returnMap.put("tblBrand", this.getYohoBrand(paramMap));
-				return searchApiResult.setData(returnMap);
-			}
+			} 
+			// 4、获取有货品牌信息
+			returnMap.put("brand", this.getYohoBrand(paramMap));
+			
+			//5、返回结果
 			return searchApiResult.setData(returnMap);
 		} catch (Exception e) {
 			return SearchApiResultUtils.errorSearchApiResult("searchShopsNew", paramMap, e);
 		}
 	}
-
+	
 	private JSONObject getShopDataMapFromMap(Map<String, Object> shopInfo) {
 		JSONObject shopDataMap = new JSONObject();
 		shopDataMap.put("shop_id", shopInfo.getOrDefault("shop_id", 0));