From a5d4f5da140e15781f1b39a49876104ce398b178 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期三, 18 九月 2024 14:33:42 +0800 Subject: [PATCH] 1.优惠券-活动优惠券-增加领取时间的结束时间小于当前时间则不可以发布 --- src/main/java/com/mzl/flower/service/payment/BillService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/payment/BillService.java b/src/main/java/com/mzl/flower/service/payment/BillService.java index 84b7675..65311be 100644 --- a/src/main/java/com/mzl/flower/service/payment/BillService.java +++ b/src/main/java/com/mzl/flower/service/payment/BillService.java @@ -187,7 +187,7 @@ for(OrderItem oi : items){ Integer n = oi.getNum(); supplierAmount = supplierAmount.add(oi.getSupplierPrice().multiply(new BigDecimal(n))); - markupOne = markupOne.add(oi.getMarkupOne().multiply(new BigDecimal(n))); + markupOne = markupOne.add(getAmount(oi.getMarkupOne()).multiply(new BigDecimal(n))); markupTwo = markupTwo.add(getAmount(oi.getMarkupTwo()).multiply(new BigDecimal(n))); markupPartner = markupPartner.add(getAmount(oi.getMarkupPartner()).multiply(new BigDecimal(n))); -- Gitblit v1.9.3