Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.2

@@ -600,7 +600,7 @@ public class ProductServiceImpl implements ProductService{
 				for (Storage storage : storageList) {
 					StoragePrice storagePrice = storagePriceMap.get(storage.getId());
 					//高于建议价,不展示skup
-					if(null != storagePrice && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {
+					if(null != storagePrice && null != storage.getSuggestHighPrice() && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {
 						continue;
 					}