From 5b5b6440da8b7851343a84e378e8a3340ac08d5d Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期四, 19 九月 2024 18:58:30 +0800
Subject: [PATCH] 优惠券金额空指针
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 0b26afb..681a6fd 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -541,7 +541,7 @@
List<FlowerCartListDTO> flowers = p.getFlowers();
Map<Long, List<ParamItemDTO>> paramMap = new HashMap<>();
final BigDecimal flowerAmount = order.getFlowerAmount();//订单商品总价
- final BigDecimal memberCouponAmount = order.getMemberCouponAmount();//使用优惠券面值
+ final BigDecimal memberCouponAmount = getAmount(order.getMemberCouponAmount());//使用优惠券面值
BigDecimal usedCouponAmount = new BigDecimal(0);
for (int i = 0; i < flowers.size(); i++) {
FlowerCartListDTO f = flowers.get(i);
@@ -637,7 +637,7 @@
private BigDecimal calculateCoupon(BigDecimal couponAmount, BigDecimal itemTotalAmount
, BigDecimal totalAmount, Integer num, BigDecimal price
, boolean isLastOne, BigDecimal usedCouponAmount){
- if(couponAmount == null){
+ if(couponAmount == null || couponAmount.doubleValue() == 0){
return new BigDecimal(0);
}
--
Gitblit v1.9.3