Merge branch 'feature-recommend' into 'developer'

更新unionId

See merge request !2817

haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml

@@ -22,6 +22,7 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="lastAccessTime" column="last_access_time" jdbcType="TIMESTAMP"/>
+        <result property="followTime" column="follow_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -43,7 +44,8 @@
                extend_info,
                create_time,
                update_time,
-               last_access_time
+               last_access_time,
+               follow_time
     </sql>
 
     <!--查询单个-->
@@ -66,7 +68,8 @@
                extend_info,
                create_time,
                update_time,
-               last_access_time
+               last_access_time,
+               follow_time
         from tab_haoban_interact_record
         where id = #{id}
     </select>
@@ -75,7 +78,7 @@
     <select id="queryAllByLimit" resultMap="TabHaobanInteractRecordMap">
         select
         id, enterprise_id, member_id, union_id, clerk_id, trace_id, biz_id, biz_type, store_id, channel_source,share_source,
-        event_type, duration_time, times, delete_flag, extend_info, create_time, update_time,last_access_time
+        event_type, duration_time, times, delete_flag, extend_info, create_time, update_time,last_access_time,follow_time
         from tab_haoban_interact_record
         <where>
             <if test="clerkId != null and clerkId != ''">
@@ -362,7 +365,7 @@
     </update>
 
     <update id="modifyUnionId">
-        update tab_haoban_potential_customer
+        update tab_haoban_interact_record
         set union_id = #{newUnionId}
         where enterprise_id = #{enterpriseId} and union_id = #{oldUnionId} and delete_flag = 0
     </update>