From 3e9a4992d78cf5c75486b3bed0f6f52d5cbdfadf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 09:52:18 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index a89d01e..4fa0440 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -74,7 +74,8 @@
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
- accountListVO.setTotalAmount(res.getOrderAmount());
+ accountListVO.setTotalAmount(res.getOrderAmount().subtract(res.getRefundAmount())
+ .subtract(res.getCommissionAmount()).subtract(res.getSharingAmount()));
accountListVO.setPaymentAmount(res.getPaymentAmount());
accountListVO.setRefundAmount(res.getRefundAmount());
accountListVO.setCommissionAmount(res.getCommissionAmount());
--
Gitblit v1.7.1