From 0f53f3363ffdc0db7e642aa73c68d6232b1fea22 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 22 Nov 2025 15:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 dab9f5384..4004fa0a1 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
@@ -138,16 +138,21 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
         result.setProductCostAmount(productCostAmount);
 
         //会员充值退款 充值退款金额（线上退款+现金退款）
-        BigDecimal onlineAmount = Objects.requireNonNullElse(
+        BigDecimal cashRechargeAmount = Objects.requireNonNullElse(result.getCashRechargeAmount(), BigDecimal.ZERO);
+        BigDecimal onlineRechargeAmount = Objects.requireNonNullElse(result.getOnlineRechargeAmount(), BigDecimal.ZERO);
+        BigDecimal rechargeAmount = cashRechargeAmount.add(onlineRechargeAmount);
+        result.setRechargeAmount(rechargeAmount);
+        //会员充值退款 充值退款金额（线上退款+现金退款）
+        BigDecimal onlineRefundAmount = Objects.requireNonNullElse(
                 (onlineStat != null) ? onlineStat.getOnlineRechargeRefundAmount() : null,
                 BigDecimal.ZERO
         );
-        BigDecimal userFlowAmount = Objects.requireNonNullElse(
+        BigDecimal userFlowRefundAmount = Objects.requireNonNullElse(
                 (userFlowStat != null) ? userFlowStat.getCashRechargeRefundAmount() : null,
                 BigDecimal.ZERO
         );
-        BigDecimal total = onlineAmount.add(userFlowAmount);
-        result.setRechargeRefundAmount(total);
+        BigDecimal rechargeRefundAmountTotal = onlineRefundAmount.add(userFlowRefundAmount);
+        result.setRechargeRefundAmount(rechargeRefundAmountTotal);
         //实付金额 (线上付款 现金支付 会员支付 挂账)
         BigDecimal onlinePayAmount = (onlineStat != null)
                 ? Objects.requireNonNullElse(onlineStat.getOnlinePayAmount(), BigDecimal.ZERO)