From 2a93320d3adf8c72ea127df59d0bdd043917dd79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponActivateMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponActivateMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponActivateMapper.xml
index d60ebc8..803ed6e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponActivateMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponActivateMapper.xml
@@ -6,20 +6,22 @@
<id column="usca_id" property="id" jdbcType="BIGINT"/>
<result column="usca_count" property="count" jdbcType="INTEGER"/>
<result column="usca_state" property="state" jdbcType="INTEGER"/>
+ <result column="usca_ordernos" property="ordernos" jdbcType="VARCHAR"/>
<result column="usca_create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="usca_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">usca_id,usca_count,usca_state,usca_create_time,usca_update_time</sql>
+ <sql id="Base_Column_List">usca_id,usca_count,usca_state,usca_ordernos,usca_create_time,usca_update_time</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
<include refid="Base_Column_List"/>from yeshi_ec_user_system_coupon_activate where usca_id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_system_coupon_activate where usca_id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_activate (usca_id,usca_count,usca_state,usca_create_time,usca_update_time) values (#{id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_activate (usca_id,usca_count,usca_state,usca_ordernos,usca_create_time,usca_update_time) values (#{id,jdbcType=BIGINT},#{count,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{ordernos,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_system_coupon_activate
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">usca_id,</if>
<if test="count != null">usca_count,</if>
<if test="state != null">usca_state,</if>
+ <if test="ordernos != null">usca_ordernos,</if>
<if test="createTime != null">usca_create_time,</if>
<if test="updateTime != null">usca_update_time,</if>
</trim>values
@@ -27,20 +29,22 @@
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="count != null">#{count,jdbcType=INTEGER},</if>
<if test="state != null">#{state,jdbcType=INTEGER},</if>
+ <if test="ordernos != null">#{ordernos,jdbcType=VARCHAR},</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.UserSystemCouponActivate">update yeshi_ec_user_system_coupon_activate set usca_count = #{count,jdbcType=INTEGER},usca_state = #{state,jdbcType=INTEGER},usca_create_time = #{createTime,jdbcType=TIMESTAMP},usca_update_time = #{updateTime,jdbcType=TIMESTAMP} where usca_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate">update yeshi_ec_user_system_coupon_activate set usca_count = #{count,jdbcType=INTEGER},usca_state = #{state,jdbcType=INTEGER},usca_ordernos = #{ordernos,jdbcType=VARCHAR},usca_create_time = #{createTime,jdbcType=TIMESTAMP},usca_update_time = #{updateTime,jdbcType=TIMESTAMP} where usca_id = #{id,jdbcType=BIGINT}</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate">update yeshi_ec_user_system_coupon_activate
<set>
<if test="count != null">usca_count=#{count,jdbcType=INTEGER},</if>
<if test="state != null">usca_state=#{state,jdbcType=INTEGER},</if>
+ <if test="ordernos != null">usca_ordernos=#{ordernos,jdbcType=VARCHAR},</if>
<if test="createTime != null">usca_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">usca_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
</set> where usca_id = #{id,jdbcType=BIGINT}
</update>
-
+
<select id="selectForUpdate" resultMap="BaseResultMap" >
SELECT * FROM yeshi_ec_user_system_coupon_activate
@@ -52,5 +56,4 @@
SET usca_count = usca_count + #{count},usca_update_time = NOW()
WHERE usca_id = #{id}
</select>
-
</mapper>
--
Gitblit v1.8.0