From 0c570abeb48ab0afe44a92be8247070de20d0aa2 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 11 九月 2024 14:30:41 +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