From 38fb21c022eb1c5037e3aa377aaa7f4f38de9cf7 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Tue, 26 Jul 2022 13:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9EVCS=E4=BF=AE=E6=94=B9,?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=B5=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?3=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml      | 4 ++--
 .../src/main/resources/mapper/XhpcInternetUserMapper.xml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 49ce589c..c66cf27b 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -575,7 +575,7 @@
             cs.name as chargingStationName,
             te.name as terminalName,
             ho.act_price as actPrice,
-            co.charging_degree as chargingDegree,
+            ho.total_power as chargingDegree,
             co.charging_time as chargingTime
         FROM xhpc_history_order as ho
         LEFT JOIN xhpc_charging_station as cs on cs.charging_station_id = ho.charging_station_id
@@ -601,7 +601,7 @@
             ho.act_price as actPrice,
             ho.act_power_price as actPowerPrice,
             co.charging_time as chargingTime,
-            co.charging_degree as chargingDegree,
+            ho.total_power as chargingDegree,
             ho.total_price as totalPrice,
             ho.power_price_total as powerPriceTotal,
             ho.promotion_discount as promotionDiscount,
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
index 9d65e737..4e2d025d 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcInternetUserMapper.xml
@@ -226,8 +226,8 @@
             <if test="null != updateBy and '' != updateBy">update_by = #{updateBy},</if>
             <if test="null != updateTime">update_time = #{updateTime},</if>
             <if test="null != remark and '' != remark">remark = #{remark},</if>
-            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">operator_id_evcs = #{operatorIdEvcs}</if>
-            <if test="null != roleId">role_id = #{roleId}</if>
+            <if test="null != operatorIdEvcs and '' != operatorIdEvcs">operator_id_evcs = #{operatorIdEvcs},</if>
+            <if test="null != roleId">role_id = #{roleId},</if>
         </set>
         WHERE internet_user_id = #{internetUserId}
     </update>