Merge branch 'dev_order' into test6.8.2

caoyan
Commit d8ec6f98707af0ec0e22e9fa7b5e675898efaa72 2 parents ecfd1e7f 889116c0
Showing 1 changed file with 1 additions and 1 deletions
product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
--- a/product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
View file @d8ec6f9
+++ b/product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java
View file @d8ec6f9
@@ -596,7 +596,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;
 					}