diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index a9878640..a6036417 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -393,7 +393,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { + if (coupon.getFullAmount().compareTo(BigDecimal.ZERO) > 0 && coupon.getFullAmount().compareTo(totalAmount.getPrice()) > 0) { throw new ValidateException("生成支付订单失败,商品券:" + coupon + " 未达到使用门槛" + coupon.getFullAmount() + "元"); } boolean isAllFoods = true; @@ -432,7 +432,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { + if (coupon.getMaxDiscountAmount().compareTo(BigDecimal.ZERO) > 0 && rateAmount.getPrice().compareTo(coupon.getMaxDiscountAmount()) > 0) { rateAmount.setPrice(coupon.getMaxDiscountAmount()); } } else { @@ -690,6 +690,9 @@ public class OrderInfoServiceImpl extends ServiceImpl orderDetails, boolean isAllFoods, List couponFoodIds, BigDecimal thresholdAmount) { + if (thresholdAmount.compareTo(BigDecimal.ZERO) == 0) { + return; + } BigDecimal foodsAmount = BigDecimal.ZERO; for (OrderDetail detail : orderDetails) { if ((isAllFoods || couponFoodIds.contains(detail.getProductId())) || couponFoodIds.contains(detail.getProductId())