From f531afb50388dc0ad39a55c8a7d28ba20ad4b0f3 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 20 May 2022 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/XhpcHistoryOrderMapper.xml   |  2 +-
 .../src/main/resources/mapper/XhpcRateTimeMapper.xml   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 16a29946..0be3e566 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -181,7 +181,7 @@
         SELECT
         DATE_FORMAT( end_time, "%Y-%m-%d" ) end_time,
         count( history_order_id ) number,
-        sum(act_power_price+act_service_price) actPrice
+        FLOOR(ifnull(sum(act_power_price+act_service_price),0)) actPrice
         FROM
         xhpc_history_order
         WHERE
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml
index 065289dd..acf29bd4 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcRateTimeMapper.xml
@@ -35,13 +35,13 @@
     </select>
     <select id="selectByTenantIdsAndCharingStationIds" resultType="Map">
         select
-        ROUND(ro.charging_degree,2) as chargingDegree,
+        ifnull(ROUND(ro.charging_degree,2),0) as chargingDegree,
         DATE_FORMAT(co.start_time,"%H:%i") as startTime,
-        ro.amount_charged amountCharged,
-        ro.electric_current electricCurrent,
+        ifnull(ro.amount_charged,0) amountCharged,
+        ifnull(ro.electric_current,0) electricCurrent,
         ro.real_time_order_id as realTimeOrderId,
-        ro.voltage as voltage,
-        ro.soc as soc,
+        ifnull(ro.voltage,0) as voltage,
+        ifnull(ro.soc,0) as soc,
         ro.charging_time chargingTime,
         CASE
         WHEN co.charging_mode = "新电途" THEN