From 7b9dcafc53509f57aa00c9ecc8339e78437ffb81 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 4 Feb 2026 16:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E5=9D=97=E5=A2=9E=E5=8A=A0=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopOrderStatisticServiceImpl.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
index 1251ed82d..383d946c1 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
@@ -70,7 +70,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         }
         if (day <= 1) {
             return List.of(onlineDataAmount);
-        }else {
+        } else {
             startDate = currentDate.minusDays(day - 1);
         }
         List<TotalVo> statDateRange = mapper.getStatDateRange(shopId, startDate, currentDate);
@@ -84,7 +84,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         if (day <= 1) {
             Map<String, BigDecimal> onlinePayTypeDate = mapper.getOnlinePayTypeDate(shopId, currentDate);
             return CountPayTypeVo.realTimeDataByDay(onlinePayTypeDate);
-        }else {
+        } else {
             startDate = currentDate.minusDays(day - 1);
         }
         return CountPayTypeVo.mergePayTypeData(
@@ -104,7 +104,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         }
         if (day <= 1) {
             return List.of(onlineProfitRateBarChart);
-        }else {
+        } else {
             startDate = currentDate.minusDays(day - 1);
         }
         List<ProfitRateVO> statDateRange = mapper.profitRateBarChart(shopId, startDate, currentDate);
@@ -180,10 +180,11 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         result.setTableCount(Optional.ofNullable(tableCount).orElse(0L));
         result.setProductCostAmount(Optional.ofNullable(productCostAmount).orElse(BigDecimal.ZERO));
 
-        //会员充值退款 充值退款金额（线上退款+现金退款）
+        //会员充值金额（线上充值+现金充值+霸王餐充值）
         BigDecimal cashRechargeAmount = Objects.requireNonNullElse(result.getCashRechargeAmount(), BigDecimal.ZERO);
         BigDecimal onlineRechargeAmount = Objects.requireNonNullElse(result.getOnlineRechargeAmount(), BigDecimal.ZERO);
-        BigDecimal rechargeAmount = cashRechargeAmount.add(onlineRechargeAmount);
+        BigDecimal freeRechargeAmount = Objects.requireNonNullElse(onlineStat != null ? onlineStat.getBackDiscountAmount() : null, BigDecimal.ZERO);
+        BigDecimal rechargeAmount = cashRechargeAmount.add(onlineRechargeAmount).add(freeRechargeAmount);
         result.setRechargeAmount(rechargeAmount);
         //会员充值退款 充值退款金额（线上退款+现金退款）
         BigDecimal onlineRechargeRefundAmount = Objects.requireNonNullElse(