Authored by caoyan

香港直邮

@@ -954,12 +954,8 @@ public class ProductServiceImpl implements ProductService { @@ -954,12 +954,8 @@ public class ProductServiceImpl implements ProductService {
954 Map<String, StoragePrice> storagePriceMap = getStorageLeastPriceInfo(productId); 954 Map<String, StoragePrice> storagePriceMap = getStorageLeastPriceInfo(productId);
955 955
956 for (Storage storage : storageList) { 956 for (Storage storage : storageList) {
957 - StoragePrice storagePriceDl = storagePriceMap.get(storage.getId() + "_0_0");//大陆现货 957 + StoragePrice storagePrice = storagePriceMap.get(storage.getId() + "_0_0");//大陆现货
958 StoragePrice storagePriceHk = storagePriceMap.get(storage.getId() + "_0_1");//香港现货 958 StoragePrice storagePriceHk = storagePriceMap.get(storage.getId() + "_0_1");//香港现货
959 - StoragePrice storagePrice = storagePriceDl == null ? storagePriceHk : storagePriceDl;  
960 - if(storagePriceDl != null && storagePriceHk != null && storagePriceHk.getPrice().compareTo(storagePriceDl.getPrice()) < 0) {  
961 - storagePrice = storagePriceHk;  
962 - }  
963 959
964 StoragePrice storagePricePre = storagePriceMap.get(storage.getId() + "_1_0");//大陆预售 960 StoragePrice storagePricePre = storagePriceMap.get(storage.getId() + "_1_0");//大陆预售
965 961