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