From 62d3dfbe3fb7a97c4b795019fb7ad9f38fa12fd3 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sun, 15 Sep 2024 16:05:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E6=8E=92=E8=A1=8C=E6=89=A3?=
 =?UTF-8?q?=E6=8E=89=E9=80=80=E6=AC=BE=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/service/impl/EtOrderServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
index b01ffee..36843c3 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
@@ -986,7 +986,9 @@ public class EtOrderServiceImpl implements IEtOrderService
             Long areaId = area.getAreaId();
             LeaderboardVo leaderboardVo = new LeaderboardVo();
             leaderboardVo.setOrderCount(etOrderMapper.getOrderNum(startDateStr, endDateStr, areaId));//订单数
-            leaderboardVo.setOrderFee(etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId));//订单金额
+            BigDecimal payFee = etOrderMapper.getPayFee(startDateStr, endDateStr, null, areaId);
+            BigDecimal refundFee = etOrderMapper.getRefundFee(startDateStr, endDateStr, null, areaId);
+            leaderboardVo.setOrderFee(payFee.subtract(refundFee));//订单金额
             String inOrderCount = etOrderMapper.getRidingOrder(startDateStr, endDateStr,areaId+"");
             leaderboardVo.setInProgressOrderCount(Integer.parseInt(inOrderCount));
             leaderboardVo.setAreaId(areaId);