ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit a634b2725c26c11240a8d664c1b85605b818b9a9 2 parents a76706e5 b69f9039

Merge branch 'dev_order' into test6.8.2

Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
@@ -583,13 +583,19 @@ public class ProductServiceImpl implements ProductService{ @@ -583,13 +583,19 @@ public class ProductServiceImpl implements ProductService{
583 Map<Integer, StoragePrice> storagePriceMap = getStoragePriceMap(storageList); 583 Map<Integer, StoragePrice> storagePriceMap = getStoragePriceMap(storageList);
584 584
585 for (Storage storage : storageList) { 585 for (Storage storage : storageList) {
  586 + StoragePrice storagePrice = storagePriceMap.get(storage.getId());
  587 + //高于建议价,不展示skup
  588 + if(null != storagePrice && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {
  589 + continue;
  590 + }
  591 +
586 GoodsSize goodsSize = new GoodsSize(); 592 GoodsSize goodsSize = new GoodsSize();
587 goodsSize.setId(storage.getId()); 593 goodsSize.setId(storage.getId());
588 goodsSize.setSizeId(storage.getSizeId()); 594 goodsSize.setSizeId(storage.getSizeId());
589 Size size = sizeMap.get(storage.getSizeId()); 595 Size size = sizeMap.get(storage.getSizeId());
590 goodsSize.setSizeName(size == null ? "" : size.getSizeName()); 596 goodsSize.setSizeName(size == null ? "" : size.getSizeName());
591 goodsSize.setOrderBy(size == null ? 0 : size.getOrderBy()); 597 goodsSize.setOrderBy(size == null ? 0 : size.getOrderBy());
592 - StoragePrice storagePrice = storagePriceMap.get(storage.getId()); 598 +
593 goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice()); 599 goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice());
594 goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus()); 600 goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus());
595 goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum()); 601 goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum());