From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
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