diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 744c032..2162aad 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -275,16 +275,23 @@ public class ProductService { //价格组装 for (TbProductSku tbProductSku : productSku.get()) { - //原价 + //售价 if (tbProductSku.getSalePrice().compareTo(BigDecimal.ZERO) == 0) { - productInfo.setOriginPrice(BigDecimal.ZERO); - productInfo.setDiscount(BigDecimal.ZERO); + if(tbProductSku.getOriginPrice().compareTo(BigDecimal.ZERO) == 0){ + productInfo.setOriginPrice(BigDecimal.ZERO); + productInfo.setDiscount(BigDecimal.ZERO); + productInfo.setSalePrice(BigDecimal.ZERO); + }else { + productInfo.setOriginPrice(tbProductSku.getOriginPrice()); + productInfo.setDiscount(BigDecimal.ZERO); + productInfo.setSalePrice(tbProductSku.getOriginPrice()); + } } else { - productInfo.setOriginPrice(tbProductSku.getSalePrice()); + productInfo.setOriginPrice(tbProductSku.getOriginPrice()); productInfo.setDiscount(BigDecimalUtils.getDiscount(tbProductSku.getOriginPrice(), tbProductSku.getSalePrice())); + //现价 + productInfo.setSalePrice(tbProductSku.getSalePrice()); } - //现价 - productInfo.setSalePrice(new BigDecimal(tbProductSku.getSalePrice().toString())); } //销量 productInfo.setRealSalesNumber(new BigDecimal(tbProduct.getRealSalesNumber()));