From 9e3c6fa190b1c59b2178ae1823c994684a4d9df3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 24 十月 2024 14:20:03 +0800
Subject: [PATCH] fix:结算

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