From cb84a07869a7b4f872fa1da1184bc466f8d8b17d Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期二, 04 三月 2025 16:54:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml | 8 ++++----
ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
index c72c8f5..8995310 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBankFlowMapper.xml
@@ -37,9 +37,9 @@
<!-- 统计总额和微信支付金额 -->
<select id="getPaymentStats" resultMap="PaymentStatsResultMap">
SELECT
- SUM(flow_money) AS totalFlowMoney,
- SUM(deduction_money) AS totalDeductionMoney,
- SUM(remaining_money) AS totalRemainingMoney
+ ifnull(SUM(flow_money),0) AS totalFlowMoney,
+ ifnull(SUM(deduction_money),0) AS totalDeductionMoney,
+ ifnull(SUM(remaining_money),0) AS totalRemainingMoney
FROM
t_bank_flow
<where>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
index f11b0fd..136ec5f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFlowManagementMapper.xml
@@ -39,10 +39,10 @@
<!-- 统计总额和微信支付金额 -->
<select id="getPaymentStats" resultMap="PaymentStatsResultMap">
- SELECT SUM(flow_money) AS total_amount,
- SUM(CASE WHEN pay_type = 1 THEN flow_money ELSE 0 END ) AS wechat_amount,
- SUM(CASE WHEN pay_type = 2 THEN flow_money ELSE 0 END ) AS alipay_amount,
- SUM(CASE WHEN pay_type = 3 THEN flow_money ELSE 0 END ) AS offline_amount
+ SELECT ifnull(SUM(flow_money),0) AS total_amount,
+ ifnull(SUM(CASE WHEN pay_type = 1 THEN flow_money ELSE 0 END ) ,0)AS wechat_amount,
+ ifnull(SUM(CASE WHEN pay_type = 2 THEN flow_money ELSE 0 END ),0) AS alipay_amount,
+ ifnull(SUM(CASE WHEN pay_type = 3 THEN flow_money ELSE 0 END ),0) AS offline_amount
FROM
t_flow_management
<where>
--
Gitblit v1.7.1