From bb1d96cc0e67ad8f2f2dbc389219e0db6d0aa5ac Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 29 八月 2024 16:16:05 +0800 Subject: [PATCH] 1.优惠券相关代码提交 --- src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java index 2a89ef7..41ad60b 100644 --- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java +++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java @@ -591,17 +591,18 @@ throw new ValidationException("处理数量不能大于商品数量"); } - if(deductAmount != null && deductAmount.doubleValue() > oi.getTotal().doubleValue()){ - throw new ValidationException("降级金额不能大于商品总金额"); - } - - BigDecimal deduct = deductAmount; - if(deduct == null){ - deduct = new BigDecimal(0); - if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){ - deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum())); - } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){ - deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum())); + BigDecimal deduct = new BigDecimal(0); + if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){ + deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum())); + } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){ + deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum())); + } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) { + if(deductAmount == null){ + throw new ValidationException("降级金额不能为空"); + } + deduct = deductAmount.multiply(new BigDecimal(dto.getNum())); + if(deduct.doubleValue() > oi.getTotal().doubleValue()){ + throw new ValidationException("降级金额不能大于商品总金额"); } } -- Gitblit v1.9.3