From 278b5ba31ed7576da7278da36dfbdc36cd3bb836 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Sun, 9 Oct 2022 16:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E5=80=BC=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/XhpcRechargeOrderMapper.xml     | 12 ++++++------
 .../main/resources/mapper/XhpcRefundOrderMapper.xml  | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
index dd2e51de..350efea3 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
@@ -213,12 +213,12 @@
     </select>
 
     <select id="sumMoney" resultType="map">
-        select
-               sum(xro.amount) amount,
-        (select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time1} and tenant_id =#{tenantId} and del_flag = 0 and status=1) one,
-        (select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time2} and tenant_id =#{tenantId} and del_flag = 0 and status=1) two,
-        (select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time3} and tenant_id =#{tenantId} and del_flag = 0 and status=1) three,
-        (select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time4} and tenant_id =#{tenantId} and del_flag = 0 and status=1) four
+     select
+        ifnull(sum(xro.amount),0) amount,
+        ifnull((select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time1} and tenant_id =#{tenantId} and del_flag = 0 and status=1),0) one,
+        ifnull((select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time2} and tenant_id =#{tenantId} and del_flag = 0 and status=1),0) two,
+        ifnull((select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time3} and tenant_id =#{tenantId} and del_flag = 0 and status=1),0) three,
+        ifnull((select sum(amount) from xhpc_recharge_order where create_time &gt;= #{time4} and tenant_id =#{tenantId} and del_flag = 0 and status=1),0) four
         from xhpc_recharge_order xro
         where xro.del_flag = 0
         ORDER BY xro.create_time DESC
diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
index a74420dd..af39c6a8 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
@@ -246,11 +246,11 @@
 
     <select id="sumMoney" resultType="map">
         select
-          sum(xro.amount) amount,
-        (select sum(amount) from xhpc_refund_order where create_time &gt;= #{time1} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1) one,
-        (select sum(amount) from xhpc_refund_order where create_time &gt;= #{time2} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1) two,
-        (select sum(amount) from xhpc_refund_order where create_time &gt;= #{time3} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1) three,
-        (select sum(amount) from xhpc_refund_order where create_time &gt;= #{time4} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1) four
+            ifnull(sum(xro.amount),0) amount,
+            ifnull((select sum(amount) from xhpc_refund_order where create_time &gt;= #{time1} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1),0) one,
+            ifnull((select sum(amount) from xhpc_refund_order where create_time &gt;= #{time2} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1),0) two,
+            ifnull((select sum(amount) from xhpc_refund_order where create_time &gt;= #{time3} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1),0) three,
+            ifnull((select sum(amount) from xhpc_refund_order where create_time &gt;= #{time4} and tenant_id =#{tenantId} and del_flag = 0 and examine_status=1 and status =1),0) four
         from xhpc_refund_order xro
         where xro.del_flag = 0 and xro.examine_status=1 and xro.status =1
         ORDER BY xro.create_time DESC