返回的店铺需要是开店的

@@ -236,12 +236,12 @@ public class BrandWithShopsServiceImpl implements IBrandWithShopsService, Applic
 				continue;
 				continue;
 			}
 			}
 			Map<String, Object> shopInfo = shopInfoMap.get(shopId);
 			Map<String, Object> shopInfo = shopInfoMap.get(shopId);
-			if (shopInfo == null ) {
+			if (shopInfo == null) {
+				continue;
+			}
+			if ((Integer) shopInfo.get("status") != 1) {
 				continue;
 				continue;
 			}
 			}
-//			if ((Integer) shopInfo.get("status") != 1 || (Integer) shopInfo.get("check_status") != 300) {
-//				continue;
-//			}
 			yohoShops.add(shopInfo);
 			yohoShops.add(shopInfo);
 		}
 		}
 		return yohoShops;
 		return yohoShops;
@@ -255,7 +255,7 @@ public class BrandWithShopsServiceImpl implements IBrandWithShopsService, Applic
 	private JSONArray getGlobalBrandList(List<BrandShopInfo> brandShopInfoList, String brandId, Map<String, Map<String, Object>> globalBrandInfoMap) {
 	private JSONArray getGlobalBrandList(List<BrandShopInfo> brandShopInfoList, String brandId, Map<String, Map<String, Object>> globalBrandInfoMap) {
 		JSONArray getGlobalBrandList = new JSONArray();
 		JSONArray getGlobalBrandList = new JSONArray();
 		Map<String, Object> globalBrandInfo = globalBrandInfoMap.get(brandId);
 		Map<String, Object> globalBrandInfo = globalBrandInfoMap.get(brandId);
-		if(globalBrandInfo==null){
+		if (globalBrandInfo == null) {
 			return getGlobalBrandList;
 			return getGlobalBrandList;
 		}
 		}
 		boolean isGlobalBrand = false;
 		boolean isGlobalBrand = false;
@@ -276,13 +276,12 @@ public class BrandWithShopsServiceImpl implements IBrandWithShopsService, Applic
 			}
 			}
 			isGlobalBrand = true;
 			isGlobalBrand = true;
 		}
 		}
-		if(isGlobalBrand){
+		if (isGlobalBrand) {
 			getGlobalBrandList.add(globalBrandInfo);
 			getGlobalBrandList.add(globalBrandInfo);
 		}
 		}
 		return getGlobalBrandList;
 		return getGlobalBrandList;
 	}
 	}
 
 
-	
 	/**
 	/**
 	 * 是否是合法的店铺信息
 	 * 是否是合法的店铺信息
 	 * 
 	 *