diff --git a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java b/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java index c8c24c1..c48c558 100644 --- a/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java +++ b/src/main/java/com/ycwl/basic/model/pc/coupon/entity/CouponEntity.java @@ -48,6 +48,9 @@ public class CouponEntity { private Date createAt; public BigDecimal calculateDiscountPrice(BigDecimal originalPrice) { + if (originalPrice == null) { + return BigDecimal.ZERO; + } if (discountType == 0) { return discountPrice; } else { @@ -55,6 +58,9 @@ public class CouponEntity { } } public BigDecimal calculateDiscountPrice(String originalPrice) { + if (originalPrice == null) { + return BigDecimal.ZERO; + } BigDecimal priceObj = new BigDecimal(originalPrice); if (discountType == 0) { return discountPrice; @@ -63,6 +69,9 @@ public class CouponEntity { } } public String calculateDiscountedPrice(String originalPrice) { + if (originalPrice == null) { + return "0.00"; + } BigDecimal priceObj = new BigDecimal(originalPrice); if (discountType == 0) { return priceObj.subtract(discountPrice).setScale(2, RoundingMode.HALF_DOWN).toString();