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 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - operator_id_evcs = #{operatorIdEvcs} - role_id = #{roleId} + operator_id_evcs = #{operatorIdEvcs}, + role_id = #{roleId}, WHERE internet_user_id = #{internetUserId}