From 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 15:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
index 5148c47..fe2963d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
@@ -9,6 +9,7 @@
<result column="uie_rank_update_time" property="rankUpdateTime" jdbcType="TIMESTAMP"/>
<result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
<result column="uie_lottery_newbies" property="lotteryNewbies" jdbcType="INTEGER"/>
+ <result column="uie_coupon_news" property="couponNews" jdbcType="INTEGER"/>
<result column="uie_create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="uie_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -28,6 +29,7 @@
<result column="uie_rank_update_time" property="rankUpdateTime" jdbcType="TIMESTAMP"/>
<result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
<result column="uie_lottery_newbies" property="lotteryNewbies" jdbcType="INTEGER"/>
+ <result column="uie_coupon_news" property="couponNews" jdbcType="INTEGER"/>
<result column="uie_create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="uie_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -39,7 +41,7 @@
</resultMap>
- <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_create_time,uie_update_time</sql>
+ <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_create_time,uie_update_time</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
<include refid="Base_Column_List"/>from yeshi_ec_user_info_extra where uie_id = #{id,jdbcType=BIGINT}
@@ -47,7 +49,7 @@
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_info_extra where uie_id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_create_time,uie_update_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_create_time,uie_update_time) values (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{couponNews,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -59,6 +61,7 @@
<if test="rankUpdateTime != null">uie_rank_update_time,</if>
<if test="inviteCode != null">uie_invite_code,</if>
<if test="lotteryNewbies != null">uie_lottery_newbies,</if>
+ <if test="couponNews != null">uie_coupon_news,</if>
<if test="createTime != null">uie_create_time,</if>
<if test="updateTime != null">uie_update_time,</if>
</trim>values
@@ -71,11 +74,12 @@
<if test="rankUpdateTime != null">#{rankUpdateTime,jdbcType=TIMESTAMP},</if>
<if test="inviteCode != null">#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">#{lotteryNewbies,jdbcType=INTEGER},</if>
+ <if test="couponNews != null">#{couponNews,jdbcType=INTEGER},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update yeshi_ec_user_info_extra set uie_uid = #{userInfo.id,jdbcType=BIGINT},uie_rank_id = #{userRank.id,jdbcType=BIGINT},uie_rank_source = #{rankSource,jdbcType=INTEGER},uie_rank_order_num = #{rankOrderNum,jdbcType=INTEGER},uie_rank_update_time = #{rankUpdateTime,jdbcType=TIMESTAMP},uie_invite_code = #{inviteCode,jdbcType=VARCHAR},uie_lottery_newbies = #{lotteryNewbies,jdbcType=INTEGER},uie_create_time = #{createTime,jdbcType=TIMESTAMP},uie_update_time = #{updateTime,jdbcType=TIMESTAMP} where uie_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update yeshi_ec_user_info_extra set uie_uid = #{userInfo.id,jdbcType=BIGINT},uie_rank_id = #{userRank.id,jdbcType=BIGINT},uie_rank_source = #{rankSource,jdbcType=INTEGER},uie_rank_order_num = #{rankOrderNum,jdbcType=INTEGER},uie_rank_update_time = #{rankUpdateTime,jdbcType=TIMESTAMP},uie_invite_code = #{inviteCode,jdbcType=VARCHAR},uie_lottery_newbies = #{lotteryNewbies,jdbcType=INTEGER},uie_coupon_news = #{couponNews,jdbcType=INTEGER},uie_create_time = #{createTime,jdbcType=TIMESTAMP},uie_update_time = #{updateTime,jdbcType=TIMESTAMP} where uie_id = #{id,jdbcType=BIGINT}</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">update yeshi_ec_user_info_extra
<set>
<if test="userInfo != null">uie_uid=#{userInfo.id,jdbcType=BIGINT},</if>
@@ -85,6 +89,7 @@
<if test="rankUpdateTime != null">uie_rank_update_time=#{rankUpdateTime,jdbcType=TIMESTAMP},</if>
<if test="inviteCode != null">uie_invite_code=#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">uie_lottery_newbies=#{lotteryNewbies,jdbcType=INTEGER},</if>
+ <if test="couponNews != null">uie_coupon_news=#{couponNews,jdbcType=INTEGER},</if>
<if test="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
</set> where uie_id = #{id,jdbcType=BIGINT}
@@ -98,6 +103,7 @@
<if test="rankUpdateTime != null">uie_rank_update_time=#{rankUpdateTime,jdbcType=TIMESTAMP},</if>
<if test="inviteCode != null">uie_invite_code=#{inviteCode,jdbcType=VARCHAR},</if>
<if test="lotteryNewbies != null">uie_lottery_newbies=#{lotteryNewbies,jdbcType=INTEGER},</if>
+ <if test="couponNews != null">uie_coupon_news=#{couponNews,jdbcType=INTEGER},</if>
<if test="createTime != null">uie_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
</set> where uie_uid = #{userInfo.id,jdbcType=BIGINT}
--
Gitblit v1.8.0