From 478546850c145257f41c04c44a471ba2741216b6 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期四, 05 九月 2024 09:10:17 +0800 Subject: [PATCH] 账单计算 --- src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 8cca07c..5971386 100644 --- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java +++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java @@ -609,13 +609,13 @@ 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())); + deduct = oi.getRealPrice().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())); - BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum())); + BigDecimal dt = oi.getRealPrice().multiply(new BigDecimal(dto.getNum())); if(deduct.doubleValue() > dt.doubleValue()){ throw new ValidationException("降级金额不能大于商品处理数量金额"); } -- Gitblit v1.9.3