From c97b518d5fbb570817ca835e96c1b8aa49b099e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 19:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 1 +
1 files changed, 1 insertions(+), 0 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 f10fe03..6288179 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
@@ -75,6 +75,7 @@
ChargingBillVO res = chargingBillService.chargingBillList1(dto);
List<ChargingBillListVO> records = res.getList().getRecords();
accountListVO.setBillCount(records.size());
+ accountListVO.setTotalAmount(res.getOrderAmount());
accountListVO.setPaymentAmount(res.getPaymentAmount());
accountListVO.setRefundAmount(res.getRefundAmount());
accountListVO.setCommissionAmount(res.getCommissionAmount());
--
Gitblit v1.7.1