Merge branch 'dev_order' into test6.8.2

@@ -583,13 +583,19 @@ public class ProductServiceImpl implements ProductService{
 				Map<Integer, StoragePrice> storagePriceMap = getStoragePriceMap(storageList);
 
 				for (Storage storage : storageList) {
+					StoragePrice storagePrice = storagePriceMap.get(storage.getId());
+					//高于建议价,不展示skup
+					if(null != storagePrice && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {
+						continue;
+					}
+					
 					GoodsSize goodsSize = new GoodsSize();
 					goodsSize.setId(storage.getId());
 					goodsSize.setSizeId(storage.getSizeId());
 					Size size = sizeMap.get(storage.getSizeId());
 					goodsSize.setSizeName(size == null ? "" : size.getSizeName());
 					goodsSize.setOrderBy(size == null ? 0 : size.getOrderBy());
-					StoragePrice storagePrice = storagePriceMap.get(storage.getId());
+					
 					goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice());
 					goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus());
 					goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum());