From f042dcb76cfced4be7bf66c209c0fe526973b7dc Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 14 Jun 2022 09:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=85=E5=88=86=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=9D=9E=E7=A9=BA=E4=B8=BA=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcClearingHistoryOrderMapper.xml | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
index 8d23b5fd..d7a92373 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
@@ -68,17 +68,32 @@
     </resultMap>
     <sql id="Base_Column_List">
         ho.clearing_order_id, ho.charging_station_id, ho.charge_order_id, ho.user_id, ho.terminal_id, ho.serial_number,
-    ho.internet_serial_number, ho.power_price_total, ho.service_price_total, ho.total_price, ho.promotion_discount,
-    ho.act_price, ho.act_power_price, ho.act_service_price, ho.internet_commission, ho.internet_svc_commission,
-    ho.platform_commission, ho.platform_svc_commisssion, ho.operation_commission, ho.operation_svc_commission,
+    ho.internet_serial_number,
+    ifnull(ho.power_price_total, 0) as 'power_price_total',
+    ifnull(ho.service_price_total, 0) as 'service_price_total',
+    ifnull(ho.total_price, 0) as 'total_price',
+    ifnull(ho.promotion_discount, 0) as 'promotion_discount',
+    ifnull(ho.act_price, 0) as 'act_price',
+    ifnull(ho.act_power_price, 0) as 'act_power_price',
+    ifnull(ho.act_service_price, 0) as 'act_service_price',
+    ifnull(ho.internet_commission, 0) as 'internet_commission',
+    ifnull( ho.internet_svc_commission, 0) as 'internet_svc_commission',
+    ifnull(ho.platform_commission, 0) as 'platform_commission',
+    ifnull(ho.platform_svc_commisssion, 0) as 'platform_svc_commisssion',
+    ifnull(ho.operation_commission, 0) as 'operation_commission',
+    ifnull(ho.operation_svc_commission, 0) as 'operation_svc_commission',
     ho.start_soc, ho.end_soc, ho.reconciliation_status, ho.sorting_status, ho.`type`, ho.`status`, ho.del_flag,
     ho.create_time, ho.create_by, ho.update_time, ho.update_by, ho.remark, ho.`state`, ho.vin_normal, ho.search_value,
     ho.operator_id_evcs, ho.charge_model_evcs, ho.connector_power_evcs, ho.meter_value_end_evcs,
     ho.meter_value_start_evcs, ho.operator_id3rdpty_evcs, ho.start_time, ho.end_time, ho.stop_reason_evcs,
     ho.total_power, ho.user_name_evcs, ho.phone, ho.evcs_order_no, ho.confirm_Result, ho.rate_model_id,
-    ho.charging_mode, ho.internet_degree_commission, ho.`source`, ho.tenant_id, ho.operator_id, ho.operator_name,
-    ho.clearing_checkout_id, ho.check_status, ho.check_by, ho.check_time, ho.activity_power_price_total,
-    ho.activity_service_price_total, ho.activity_total_price
+    ho.charging_mode,
+    ifnull(ho.internet_degree_commission, 0) as 'internet_degree_commission',
+    ho.`source`, ho.tenant_id, ho.operator_id, ho.operator_name,
+    ho.clearing_checkout_id, ho.check_status, ho.check_by, ho.check_time,
+    ifnull(ho.activity_power_price_total, 0) as 'activity_power_price_total',
+    ifnull(ho.activity_service_price_total, 0) as 'activity_service_price_total',
+    ifnull(ho.activity_total_price, 0) as 'activity_total_price'
     </sql>
 
 
@@ -288,8 +303,8 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from xhpc_clearing_history_order
-        where clearing_order_id = #{clearingOrderId}
+        from xhpc_clearing_history_order ho
+        where ho.clearing_order_id = #{clearingOrderId}
     </select>