From af8fc76bb9bae810b4468f86ce4b72d3671169c7 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Tue, 26 Apr 2022 17:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=B9=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcHistoryOrderMapper.xml         | 42 +++++++++----------
 .../main/resources/mapper/XhpcUserMapper.xml  |  8 ++--
 2 files changed, 25 insertions(+), 25 deletions(-)

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 id="findOneBySerialNumber" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
         select
-            o.*,
+        <include refid="Base_Column_List" />,
             s.name as 'charging_station_name'
         from
-            xhpc_history_order o
-                left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
-        where serial_number=#{serialNumber}
+            xhpc_history_order ho
+                left join xhpc_charging_station s on ho.charging_station_id=s.charging_station_id
+        where ho.serial_number=#{serialNumber}
     </select>
 
     <select id="findOneByInternetSerialNumber" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
         select
-            o.*,
+        <include refid="Base_Column_List" />,
             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.internet_serial_number=#{internetSerialNumber}
+        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.internet_serial_number=#{internetSerialNumber}
     </select>
 
     <select id="findListByInternetSerialNumbers" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
         select
-        o.*,
+        <include refid="Base_Column_List" />,
         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.internet_serial_number in
+        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.internet_serial_number in
         <foreach collection="orderNumbers" item="orderNumber" open="(" close=")" separator=",">
             #{orderNumber}
         </foreach>
@@ -180,19 +180,19 @@
 
     <select id="findListByTimeBetween" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
         select
-        o.*,
+        <include refid="Base_Column_List" />,
         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}
         <if test="startTime!=null and startTime != ''">
-            and o.create_time <![CDATA[ >= ]]> #{startTime}
+            and ho.create_time <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime !=''">
-            and o.create_time <![CDATA[ <= ]]> #{endTime}
+            and ho.create_time <![CDATA[ <= ]]> #{endTime}
         </if>
     </select>
 </mapper>
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 id="updateBatchCusUser" parameterType="list">
         <foreach collection="domainList" index="index" item="domain" separator=";">
-            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}
         </foreach>
     </update>
 
@@ -75,8 +75,8 @@
 
 
     <update id="updateCusUser">
-            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}
 
     </update>