Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-06 a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed

 fanli/src/main/java/com/yeshi/fanli/mapping/user/vip/UserVIPPreInfoMapper.xml

@@ -12,8 +12,10 @@
         jdbcType="TIMESTAMP" />
      <result column="vpi_update_time" property="updateTime"
         jdbcType="TIMESTAMP" />
      <result column="vpi_source_type" property="sourceType"
         jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List">vpi_id,vpi_uid,vpi_process,vpi_beizhu,vpi_create_time,vpi_update_time
   <sql id="Base_Column_List">vpi_id,vpi_uid,vpi_process,vpi_beizhu,vpi_create_time,vpi_update_time,vpi_source_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap"
      parameterType="java.lang.Long">
@@ -27,9 +29,9 @@
   <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo"
      useGeneratedKeys="true" keyProperty="id">insert into
      yeshi_ec_user_vip_pre_info
      (vpi_id,vpi_uid,vpi_process,vpi_beizhu,vpi_create_time,vpi_update_time)
      (vpi_id,vpi_uid,vpi_process,vpi_beizhu,vpi_create_time,vpi_update_time,vpi_source_type)
      values
      (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{process,jdbcType=INTEGER},#{beizhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
      (#{id,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{process,jdbcType=INTEGER},#{beizhu,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{sourceType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo"
      useGeneratedKeys="true" keyProperty="id">
@@ -41,6 +43,7 @@
         <if test="beizhu != null">vpi_beizhu,</if>
         <if test="createTime != null">vpi_create_time,</if>
         <if test="updateTime != null">vpi_update_time,</if>
         <if test="sourceType != null">vpi_source_type,</if>
      </trim>
      values
      <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -50,6 +53,7 @@
         <if test="beizhu != null">#{beizhu,jdbcType=VARCHAR},</if>
         <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
         <if test="sourceType != null">#{sourceType,jdbcType=INTEGER},</if>
      </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo">update
@@ -58,7 +62,8 @@
      #{process,jdbcType=INTEGER},vpi_beizhu =
      #{beizhu,jdbcType=VARCHAR},vpi_create_time =
      #{createTime,jdbcType=TIMESTAMP},vpi_update_time =
      #{updateTime,jdbcType=TIMESTAMP} where vpi_id = #{id,jdbcType=BIGINT}
      #{updateTime,jdbcType=TIMESTAMP} ,vpi_source_type
      =#{sourceType,jdbcType=INTEGER} where vpi_id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo">
      update yeshi_ec_user_vip_pre_info
@@ -68,24 +73,20 @@
         <if test="beizhu != null">vpi_beizhu=#{beizhu,jdbcType=VARCHAR},</if>
         <if test="createTime != null">vpi_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
         <if test="updateTime != null">vpi_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
         <if test="id !=null">vpi_id =#{id,jdbcType=BIGINT},</if>
         <if test="sourceType !=null">vpi_source_type =#{sourceType,jdbcType=INTEGER},</if>
      </set>
      where vpi_id = #{id,jdbcType=BIGINT}
   </update>


   <select id="selectByUidAndProcess" resultMap="BaseResultMap">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_user_vip_pre_info where vpi_uid = #{uid} and
      vpi_process=#{process}
   </select>



   <select id="listByUid" resultMap="BaseResultMap" parameterType="java.lang.Long">
      select
      <include refid="Base_Column_List" />
      from yeshi_ec_user_vip_pre_info where vpi_uid = #{uid}
   </select>

</mapper>