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);