From 5cf3e3979d922b855c667afb9f91da7d68a5d057 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 25 八月 2024 22:09:23 +0800
Subject: [PATCH] 我的配送单结算明细 调整
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 3c8e8ff..05cf7e7 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -171,25 +171,6 @@
if(ls != null && ls.size() > 0){
for(DeliveryOrderItemSettlementDTO dto : ls){
dto.setTotalAmount(dto.getPrice().multiply(new BigDecimal(dto.getNum())));
-
- if(StringUtils.isNotEmpty(dto.getStatus())) {
- Double rate = dto.getServiceFeeRate();
- BigDecimal serviceFee = new BigDecimal(0);
- if(rate != null) {
- serviceFee = dto.getTotalAmount().multiply(new BigDecimal(rate))
- .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
- dto.setServiceFee(serviceFee);
- }
-
- BigDecimal income = dto.getTotalAmount().subtract(dto.getCheckFee())
- .subtract(dto.getSalesFee()).subtract(dto.getStationFee())
- .subtract(serviceFee);//结算金额
- if (income.doubleValue() < 0) {
- income = new BigDecimal(0);
- }
-
- dto.setIncome(income);
- }
}
}
--
Gitblit v1.9.3