diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index a8b0e365..2940bb49 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -143,36 +143,36 @@ select - o.*, + , s.name as 'charging_station_name', c.charging_degree as 'charging_degree', c.charging_time as 'charging_time' - from xhpc_history_order o - left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id - left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id - where o.tenant_id=#{tenantId} + from xhpc_history_order ho + left join xhpc_charging_station s on ho.charging_station_id=s.charging_station_id + left join xhpc_charge_order c on ho.charge_order_id=c.charge_order_id + where ho.tenant_id=#{tenantId} - and o.create_time = ]]> #{startTime} + and ho.create_time = ]]> #{startTime} - and o.create_time #{endTime} + and ho.create_time #{endTime} diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcUserMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcUserMapper.xml index 961eacb2..ebf80c0d 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcUserMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcUserMapper.xml @@ -56,8 +56,8 @@ - update xhpc_community_personnel set red_packet=#{domain.redPacket}, surplus_money=#{domain.surplusMoney} - where xhpc_customers_personnel=#{domain.customersPersonnelId} + update xhpc_customers_personnel set red_packet=#{domain.redPacket}, surplus_money=#{domain.surplusMoney} + where customers_personnel_id=#{domain.customersPersonnelId} @@ -75,8 +75,8 @@ - update xhpc_community_personnel set red_packet=#{domain.redPacket}, surplus_money=#{domain.surplusMoney} - where xhpc_customers_personnel=#{domain.customersPersonnelId} + update xhpc_customers_personnel set red_packet=#{domain.redPacket}, surplus_money=#{domain.surplusMoney} + where customers_personnel_id=#{domain.customersPersonnelId}