From 47c752434caa50e59638afe4ec5e32f823208068 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:21 +0800
Subject: [PATCH] 支付改造

---
 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