ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 6c54510a99f92722be25443e16508d0510474cf9 1 parent 315f5454

详情页bug

Inline Side-by-side
Showing 1 changed file with 14 additions and 10 deletions
@@ -601,27 +601,31 @@ public class ProductServiceImpl implements ProductService{ @@ -601,27 +601,31 @@ public class ProductServiceImpl implements ProductService{
601 601
602 for (Storage storage : storageList) { 602 for (Storage storage : storageList) {
603 StoragePrice storagePrice = storagePriceMap.get(storage.getId()); 603 StoragePrice storagePrice = storagePriceMap.get(storage.getId());
604 - //高于建议价,不展示skup  
605 - if(null != storagePrice && null != storage.getSuggestHighPrice() && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {  
606 - continue;  
607 - }  
608 - 604 +
609 GoodsSize goodsSize = new GoodsSize(); 605 GoodsSize goodsSize = new GoodsSize();
610 goodsSize.setId(storage.getId()); 606 goodsSize.setId(storage.getId());
611 goodsSize.setSizeId(storage.getSizeId()); 607 goodsSize.setSizeId(storage.getSizeId());
612 Size size = sizeMap.get(storage.getSizeId()); 608 Size size = sizeMap.get(storage.getSizeId());
613 goodsSize.setSizeName(size == null ? "" : size.getSizeName()); 609 goodsSize.setSizeName(size == null ? "" : size.getSizeName());
614 goodsSize.setOrderBy(size == null ? 0 : size.getOrderBy()); 610 goodsSize.setOrderBy(size == null ? 0 : size.getOrderBy());
615 -  
616 - goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice());  
617 - goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus());  
618 - goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum());  
619 - goodsSize.setSkup(storagePrice == null ? 0 : storagePrice.getSkup()); 611 +
  612 +
620 goodsSize.setSellLeastPrice(sellMinPrice); 613 goodsSize.setSellLeastPrice(sellMinPrice);
621 goodsSize.setMaxPrice(maxPrice); 614 goodsSize.setMaxPrice(maxPrice);
622 goodsSize.setSuggestLowPrice(storage.getSuggestLowPrice()); 615 goodsSize.setSuggestLowPrice(storage.getSuggestLowPrice());
623 goodsSize.setSuggestHighPrice(storage.getSuggestHighPrice()); 616 goodsSize.setSuggestHighPrice(storage.getSuggestHighPrice());
624 goodSizeList.add(goodsSize); 617 goodSizeList.add(goodsSize);
  618 +
  619 + //高于建议价,不展示skup
  620 + if(null != storagePrice && null != storage.getSuggestHighPrice() && storagePrice.getPrice().compareTo(storage.getSuggestHighPrice()) > 0) {
  621 + goodsSize.setStorageNum(0);
  622 + goodsSize.setSkup(0);
  623 + continue;
  624 + }
  625 + goodsSize.setLeastPrice(storagePrice == null ? null : storagePrice.getPrice());
  626 + goodsSize.setStatus(storagePrice == null ? null : storagePrice.getStatus());
  627 + goodsSize.setStorageNum(storagePrice == null ? 0 : storage.getStorageNum());
  628 + goodsSize.setSkup(storagePrice == null ? 0 : storagePrice.getSkup());
625 } 629 }
626 } 630 }
627 } 631 }