|
|
@@ -130,14 +130,13 @@ public class PackageService {
|
|
|
PackageVO vo = new PackageVO();
|
|
|
BeanUtil.copyProperties(aPackage, vo);
|
|
|
|
|
|
-
|
|
|
List<Stock> stocks = stockRepo.findAllByPackageId(aPackage.getId());
|
|
|
if (CollUtil.isNotEmpty(stocks)) {
|
|
|
stocks.sort(Comparator.comparing(Stock::getPrice));
|
|
|
Stock min = stocks.get(0);
|
|
|
Stock max = stocks.get(stocks.size() - 1);
|
|
|
- vo.setAmount(min.getPrice() + " - " + max.getPrice());
|
|
|
- vo.setAmount(min.getOriginalPrice() + " - " + max.getOriginalPrice());
|
|
|
+ vo.setAmount(min.getPrice() + "-" + max.getPrice());
|
|
|
+ vo.setOriginalPrice(min.getOriginalPrice() + "-" + max.getOriginalPrice());
|
|
|
vo.setStocks(stocks);
|
|
|
}
|
|
|
return vo;
|