Skip to content
GitLab
Commit 576c885f authored by Junling Bu's avatar Junling Bu
Browse files

update[litemall-db]: 因为数据库更新，自动生成的java代码和xml文件也跟新。

parent 165e2d4a
Hide whitespace changes
Inline Side-by-side
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallKeywordMapper.xml
View file @ 576c885f
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result column="sort_order" jdbcType="INTEGER" property="sortOrder" /> <result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -86,7 +87,7 @@ ...@@ -86,7 +87,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, keyword, url, is_hot, is_default, sort_order, add_time, deleted id, keyword, url, is_hot, is_default, sort_order, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, deleted id, keyword, url, is_hot, is_default, sort_order, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
...@@ -182,7 +183,7 @@ ...@@ -182,7 +183,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, deleted id, keyword, url, is_hot, is_default, sort_order, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
...@@ -216,10 +217,10 @@ ...@@ -216,10 +217,10 @@
</selectKey> </selectKey>
insert into litemall_keyword (keyword, url, is_hot, insert into litemall_keyword (keyword, url, is_hot,
is_default, sort_order, add_time, is_default, sort_order, add_time,
deleted) deleted, version)
values (#{keyword,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{isHot,jdbcType=BIT}, values (#{keyword,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{isHot,jdbcType=BIT},
#{isDefault,jdbcType=BIT}, #{sortOrder,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{isDefault,jdbcType=BIT}, #{sortOrder,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP},
#{deleted,jdbcType=BIT}) #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallKeyword"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallKeyword">
<!-- <!--
...@@ -252,6 +253,9 @@ ...@@ -252,6 +253,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="keyword != null"> <if test="keyword != null">
...@@ -275,6 +279,9 @@ ...@@ -275,6 +279,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultType="java.lang.Long">
...@@ -318,6 +325,9 @@ ...@@ -318,6 +325,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -336,7 +346,8 @@ ...@@ -336,7 +346,8 @@
is_default = #{record.isDefault,jdbcType=BIT}, is_default = #{record.isDefault,jdbcType=BIT},
sort_order = #{record.sortOrder,jdbcType=INTEGER}, sort_order = #{record.sortOrder,jdbcType=INTEGER},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -369,6 +380,9 @@ ...@@ -369,6 +380,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -384,7 +398,8 @@ ...@@ -384,7 +398,8 @@
is_default = #{isDefault,jdbcType=BIT}, is_default = #{isDefault,jdbcType=BIT},
sort_order = #{sortOrder,jdbcType=INTEGER}, sort_order = #{sortOrder,jdbcType=INTEGER},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallKeywordExample" resultMap="BaseResultMap">
...@@ -418,7 +433,7 @@ ...@@ -418,7 +433,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, deleted id, keyword, url, is_hot, is_default, sort_order, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
View file @ 576c885f
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result column="pic_url" jdbcType="VARCHAR" property="picUrl" /> <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, add_time, deleted pic_url, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -167,7 +168,7 @@ ...@@ -167,7 +168,7 @@
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, add_time, deleted pic_url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
...@@ -227,7 +228,7 @@ ...@@ -227,7 +228,7 @@
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, add_time, deleted pic_url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
...@@ -262,13 +263,13 @@ ...@@ -262,13 +263,13 @@
insert into litemall_order_goods (order_id, goods_id, goods_name, insert into litemall_order_goods (order_id, goods_id, goods_name,
goods_sn, product_id, `number`, goods_sn, product_id, `number`,
price, specifications, price, specifications,
pic_url, add_time, deleted pic_url, add_time, deleted,
) version)
values (#{orderId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR}, values (#{orderId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR},
#{goodsSn,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, #{number,jdbcType=SMALLINT}, #{goodsSn,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, #{number,jdbcType=SMALLINT},
#{price,jdbcType=DECIMAL}, #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, #{price,jdbcType=DECIMAL}, #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
#{picUrl,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT} #{picUrl,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT},
) #{version,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoods"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoods">
<!-- <!--
...@@ -313,6 +314,9 @@ ...@@ -313,6 +314,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null"> <if test="orderId != null">
...@@ -348,6 +352,9 @@ ...@@ -348,6 +352,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultType="java.lang.Long">
...@@ -403,6 +410,9 @@ ...@@ -403,6 +410,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -425,7 +435,8 @@ ...@@ -425,7 +435,8 @@
specifications = #{record.specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, specifications = #{record.specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
pic_url = #{record.picUrl,jdbcType=VARCHAR}, pic_url = #{record.picUrl,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -470,6 +481,9 @@ ...@@ -470,6 +481,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -489,7 +503,8 @@ ...@@ -489,7 +503,8 @@
specifications = #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, specifications = #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
pic_url = #{picUrl,jdbcType=VARCHAR}, pic_url = #{picUrl,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap">
...@@ -524,7 +539,7 @@ ...@@ -524,7 +539,7 @@
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, add_time, deleted pic_url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml
View file @ 576c885f
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -102,7 +103,7 @@ ...@@ -102,7 +103,7 @@
--> -->
id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price, id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price,
coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn, coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn,
ship_channel, ship_time, confirm_time, end_time, add_time, deleted ship_channel, ship_time, confirm_time, end_time, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -141,7 +142,7 @@ ...@@ -141,7 +142,7 @@
<otherwise> <otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price, id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price,
coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn, coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn,
ship_channel, ship_time, confirm_time, end_time, add_time, deleted ship_channel, ship_time, confirm_time, end_time, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order from litemall_order
...@@ -202,7 +203,7 @@ ...@@ -202,7 +203,7 @@
<otherwise> <otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price, id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price,
coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn, coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn,
ship_channel, ship_time, confirm_time, end_time, add_time, deleted ship_channel, ship_time, confirm_time, end_time, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order from litemall_order
...@@ -240,16 +241,16 @@ ...@@ -240,16 +241,16 @@
integral_price, order_price, actual_price, integral_price, order_price, actual_price,
pay_id, pay_time, ship_sn, pay_id, pay_time, ship_sn,
ship_channel, ship_time, confirm_time, ship_channel, ship_time, confirm_time,
end_time, add_time, deleted end_time, add_time, deleted,
) version)
values (#{userId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{orderStatus,jdbcType=SMALLINT}, values (#{userId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{orderStatus,jdbcType=SMALLINT},
#{consignee,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{consignee,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{goodsPrice,jdbcType=DECIMAL}, #{freightPrice,jdbcType=DECIMAL}, #{couponPrice,jdbcType=DECIMAL}, #{goodsPrice,jdbcType=DECIMAL}, #{freightPrice,jdbcType=DECIMAL}, #{couponPrice,jdbcType=DECIMAL},
#{integralPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, #{actualPrice,jdbcType=DECIMAL}, #{integralPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, #{actualPrice,jdbcType=DECIMAL},
#{payId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{shipSn,jdbcType=VARCHAR}, #{payId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{shipSn,jdbcType=VARCHAR},
#{shipChannel,jdbcType=VARCHAR}, #{shipTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP}, #{shipChannel,jdbcType=VARCHAR}, #{shipTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP},
#{endTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT} #{endTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT},
) #{version,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrder"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrder">
<!-- <!--
...@@ -324,6 +325,9 @@ ...@@ -324,6 +325,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null"> <if test="userId != null">
...@@ -389,6 +393,9 @@ ...@@ -389,6 +393,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultType="java.lang.Long">
...@@ -474,6 +481,9 @@ ...@@ -474,6 +481,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -506,7 +516,8 @@ ...@@ -506,7 +516,8 @@
confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP}, confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
end_time = #{record.endTime,jdbcType=TIMESTAMP}, end_time = #{record.endTime,jdbcType=TIMESTAMP},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -581,6 +592,9 @@ ...@@ -581,6 +592,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -610,7 +624,8 @@ ...@@ -610,7 +624,8 @@
confirm_time = #{confirmTime,jdbcType=TIMESTAMP}, confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
end_time = #{endTime,jdbcType=TIMESTAMP}, end_time = #{endTime,jdbcType=TIMESTAMP},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap">
...@@ -646,7 +661,7 @@ ...@@ -646,7 +661,7 @@
<otherwise> <otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price, id, user_id, order_sn, order_status, consignee, mobile, address, goods_price, freight_price,
coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn, coupon_price, integral_price, order_price, actual_price, pay_id, pay_time, ship_sn,
ship_channel, ship_time, confirm_time, end_time, add_time, deleted ship_channel, ship_time, confirm_time, end_time, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_order from litemall_order
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallProductMapper.xml
View file @ 576c885f
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<result column="url" jdbcType="VARCHAR" property="url" /> <result column="url" jdbcType="VARCHAR" property="url" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, goods_id, specifications, price, `number`, url, add_time, deleted id, goods_id, specifications, price, `number`, url, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -161,7 +162,7 @@ ...@@ -161,7 +162,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, deleted id, goods_id, specifications, price, `number`, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_product from litemall_product
...@@ -220,7 +221,7 @@ ...@@ -220,7 +221,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, deleted id, goods_id, specifications, price, `number`, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_product from litemall_product
...@@ -254,10 +255,12 @@ ...@@ -254,10 +255,12 @@
</selectKey> </selectKey>
insert into litemall_product (goods_id, specifications, insert into litemall_product (goods_id, specifications,
price, `number`, url, price, `number`, url,
add_time, deleted) add_time, deleted, version
)
values (#{goodsId,jdbcType=INTEGER}, #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler}, values (#{goodsId,jdbcType=INTEGER}, #{specifications,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler},
#{price,jdbcType=DECIMAL}, #{number,jdbcType=INTEGER}, #{url,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{number,jdbcType=INTEGER}, #{url,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}) #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallProduct"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallProduct">
<!-- <!--
...@@ -290,6 +293,9 @@ ...@@ -290,6 +293,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="goodsId != null"> <if test="goodsId != null">
...@@ -313,6 +319,9 @@ ...@@ -313,6 +319,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultType="java.lang.Long">
...@@ -356,6 +365,9 @@ ...@@ -356,6 +365,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -374,7 +386,8 @@ ...@@ -374,7 +386,8 @@
`number` = #{record.number,jdbcType=INTEGER}, `number` = #{record.number,jdbcType=INTEGER},
url = #{record.url,jdbcType=VARCHAR}, url = #{record.url,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -407,6 +420,9 @@ ...@@ -407,6 +420,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -422,7 +438,8 @@ ...@@ -422,7 +438,8 @@
`number` = #{number,jdbcType=INTEGER}, `number` = #{number,jdbcType=INTEGER},
url = #{url,jdbcType=VARCHAR}, url = #{url,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap">
...@@ -456,7 +473,7 @@ ...@@ -456,7 +473,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, deleted id, goods_id, specifications, price, `number`, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_product from litemall_product
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml
View file @ 576c885f
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<result column="from" jdbcType="VARCHAR" property="from" /> <result column="from" jdbcType="VARCHAR" property="from" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, user_id, keyword, `from`, add_time, deleted id, user_id, keyword, `from`, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, keyword, `from`, add_time, deleted id, user_id, keyword, `from`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_search_history from litemall_search_history
...@@ -180,7 +181,7 @@ ...@@ -180,7 +181,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, keyword, `from`, add_time, deleted id, user_id, keyword, `from`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_search_history from litemall_search_history
...@@ -213,9 +214,11 @@ ...@@ -213,9 +214,11 @@
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into litemall_search_history (user_id, keyword, `from`, insert into litemall_search_history (user_id, keyword, `from`,
add_time, deleted) add_time, deleted, version
)
values (#{userId,jdbcType=INTEGER}, #{keyword,jdbcType=VARCHAR}, #{from,jdbcType=VARCHAR}, values (#{userId,jdbcType=INTEGER}, #{keyword,jdbcType=VARCHAR}, #{from,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}) #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistory"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistory">
<!-- <!--
...@@ -242,6 +245,9 @@ ...@@ -242,6 +245,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null"> <if test="userId != null">
...@@ -259,6 +265,9 @@ ...@@ -259,6 +265,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultType="java.lang.Long">
...@@ -296,6 +305,9 @@ ...@@ -296,6 +305,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -312,7 +324,8 @@ ...@@ -312,7 +324,8 @@
keyword = #{record.keyword,jdbcType=VARCHAR}, keyword = #{record.keyword,jdbcType=VARCHAR},
`from` = #{record.from,jdbcType=VARCHAR}, `from` = #{record.from,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -339,6 +352,9 @@ ...@@ -339,6 +352,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -352,7 +368,8 @@ ...@@ -352,7 +368,8 @@
keyword = #{keyword,jdbcType=VARCHAR}, keyword = #{keyword,jdbcType=VARCHAR},
`from` = #{from,jdbcType=VARCHAR}, `from` = #{from,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap">
...@@ -386,7 +403,7 @@ ...@@ -386,7 +403,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, keyword, `from`, add_time, deleted id, user_id, keyword, `from`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_search_history from litemall_search_history
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallStorageMapper.xml
View file @ 576c885f
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<result column="url" jdbcType="VARCHAR" property="url" /> <result column="url" jdbcType="VARCHAR" property="url" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -124,7 +125,7 @@ ...@@ -124,7 +125,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_storage from litemall_storage
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_storage from litemall_storage
...@@ -217,10 +218,12 @@ ...@@ -217,10 +218,12 @@
</selectKey> </selectKey>
insert into litemall_storage (`key`, `name`, `type`, insert into litemall_storage (`key`, `name`, `type`,
`size`, modified, url, `size`, modified, url,
add_time, deleted) add_time, deleted, version
)
values (#{key,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, values (#{key,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{size,jdbcType=INTEGER}, #{modified,jdbcType=TIMESTAMP}, #{url,jdbcType=VARCHAR}, #{size,jdbcType=INTEGER}, #{modified,jdbcType=TIMESTAMP}, #{url,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}) #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallStorage"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallStorage">
<!-- <!--
...@@ -256,6 +259,9 @@ ...@@ -256,6 +259,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="key != null"> <if test="key != null">
...@@ -282,6 +288,9 @@ ...@@ -282,6 +288,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultType="java.lang.Long">
...@@ -328,6 +337,9 @@ ...@@ -328,6 +337,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -347,7 +359,8 @@ ...@@ -347,7 +359,8 @@
modified = #{record.modified,jdbcType=TIMESTAMP}, modified = #{record.modified,jdbcType=TIMESTAMP},
url = #{record.url,jdbcType=VARCHAR}, url = #{record.url,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -383,6 +396,9 @@ ...@@ -383,6 +396,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -399,7 +415,8 @@ ...@@ -399,7 +415,8 @@
modified = #{modified,jdbcType=TIMESTAMP}, modified = #{modified,jdbcType=TIMESTAMP},
url = #{url,jdbcType=VARCHAR}, url = #{url,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap">
...@@ -433,7 +450,7 @@ ...@@ -433,7 +450,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_storage from litemall_storage
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSystemMapper.xml
View file @ 576c885f
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
<result column="key_name" jdbcType="VARCHAR" property="keyName" /> <result column="key_name" jdbcType="VARCHAR" property="keyName" />
<result column="key_value" jdbcType="VARCHAR" property="keyValue" /> <result column="key_value" jdbcType="VARCHAR" property="keyValue" />
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, key_name, key_value id, key_name, key_value, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -118,7 +120,7 @@ ...@@ -118,7 +120,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, key_name, key_value id, key_name, key_value, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_system from litemall_system
...@@ -139,6 +141,30 @@ ...@@ -139,6 +141,30 @@
from litemall_system from litemall_system
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from litemall_system
where id = #{id,jdbcType=INTEGER}
and deleted =
<choose>
<when test="andLogicalDeleted">
'1'
</when>
<otherwise>
'0'
</otherwise>
</choose>
</select>
<select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeySelective" parameterType="map" resultMap="BaseResultMap">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
...@@ -153,7 +179,7 @@ ...@@ -153,7 +179,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, key_name, key_value id, key_name, key_value, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_system from litemall_system
...@@ -185,8 +211,10 @@ ...@@ -185,8 +211,10 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into litemall_system (key_name, key_value) insert into litemall_system (key_name, key_value, deleted,
values (#{keyName,jdbcType=VARCHAR}, #{keyValue,jdbcType=VARCHAR}) version)
values (#{keyName,jdbcType=VARCHAR}, #{keyValue,jdbcType=VARCHAR}, #{deleted,jdbcType=BIT},
#{version,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallSystem"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallSystem">
<!-- <!--
...@@ -204,6 +232,12 @@ ...@@ -204,6 +232,12 @@
<if test="keyValue != null"> <if test="keyValue != null">
key_value, key_value,
</if> </if>
<if test="deleted != null">
deleted,
</if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="keyName != null"> <if test="keyName != null">
...@@ -212,6 +246,12 @@ ...@@ -212,6 +246,12 @@
<if test="keyValue != null"> <if test="keyValue != null">
#{keyValue,jdbcType=VARCHAR}, #{keyValue,jdbcType=VARCHAR},
</if> </if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultType="java.lang.Long">
...@@ -240,6 +280,12 @@ ...@@ -240,6 +280,12 @@
<if test="record.keyValue != null"> <if test="record.keyValue != null">
key_value = #{record.keyValue,jdbcType=VARCHAR}, key_value = #{record.keyValue,jdbcType=VARCHAR},
</if> </if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -253,7 +299,9 @@ ...@@ -253,7 +299,9 @@
update litemall_system update litemall_system
set id = #{record.id,jdbcType=INTEGER}, set id = #{record.id,jdbcType=INTEGER},
key_name = #{record.keyName,jdbcType=VARCHAR}, key_name = #{record.keyName,jdbcType=VARCHAR},
key_value = #{record.keyValue,jdbcType=VARCHAR} key_value = #{record.keyValue,jdbcType=VARCHAR},
deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -271,6 +319,12 @@ ...@@ -271,6 +319,12 @@
<if test="keyValue != null"> <if test="keyValue != null">
key_value = #{keyValue,jdbcType=VARCHAR}, key_value = #{keyValue,jdbcType=VARCHAR},
</if> </if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -281,7 +335,9 @@ ...@@ -281,7 +335,9 @@
--> -->
update litemall_system update litemall_system
set key_name = #{keyName,jdbcType=VARCHAR}, set key_name = #{keyName,jdbcType=VARCHAR},
key_value = #{keyValue,jdbcType=VARCHAR} key_value = #{keyValue,jdbcType=VARCHAR},
deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSystemExample" resultMap="BaseResultMap">
...@@ -315,7 +371,7 @@ ...@@ -315,7 +371,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, key_name, key_value id, key_name, key_value, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_system from litemall_system
...@@ -327,4 +383,24 @@ ...@@ -327,4 +383,24 @@
</if> </if>
limit 1 limit 1
</select> </select>
<update id="logicalDeleteByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_system set deleted = 1
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="logicalDeleteByPrimaryKey" parameterType="java.lang.Integer">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_system set deleted = 1
where id = #{id,jdbcType=INTEGER}
</update>
</mapper> </mapper>
\ No newline at end of file
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
View file @ 576c885f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<result column="goods" jdbcType="VARCHAR" property="goods" typeHandler="org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler" /> <result column="goods" jdbcType="VARCHAR" property="goods" typeHandler="org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.linlinjava.litemall.db.domain.LitemallTopic"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.linlinjava.litemall.db.domain.LitemallTopic">
<!-- <!--
...@@ -133,7 +134,8 @@ ...@@ -133,7 +134,8 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted,
version
</sql> </sql>
<sql id="Blob_Column_List"> <sql id="Blob_Column_List">
<!-- <!--
...@@ -198,7 +200,7 @@ ...@@ -198,7 +200,7 @@
</when> </when>
<otherwise> <otherwise>
id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted, id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted,
content version, content
</otherwise> </otherwise>
</choose> </choose>
from litemall_topic from litemall_topic
...@@ -262,7 +264,7 @@ ...@@ -262,7 +264,7 @@
</when> </when>
<otherwise> <otherwise>
id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted, id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted,
content version, content
</otherwise> </otherwise>
</choose> </choose>
from litemall_topic from litemall_topic
...@@ -297,13 +299,13 @@ ...@@ -297,13 +299,13 @@
insert into litemall_topic (title, subtitle, price, insert into litemall_topic (title, subtitle, price,
read_count, pic_url, sort_order, read_count, pic_url, sort_order,
goods, goods,
add_time, deleted, content add_time, deleted, version,
) content)
values (#{title,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, values (#{title,jdbcType=VARCHAR}, #{subtitle,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
#{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER}, #{readCount,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER},
#{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{content,jdbcType=LONGVARCHAR} #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER},
) #{content,jdbcType=LONGVARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallTopic"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallTopic">
<!-- <!--
...@@ -342,6 +344,9 @@ ...@@ -342,6 +344,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
<if test="content != null"> <if test="content != null">
content, content,
</if> </if>
...@@ -374,6 +379,9 @@ ...@@ -374,6 +379,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
<if test="content != null"> <if test="content != null">
#{content,jdbcType=LONGVARCHAR}, #{content,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -426,6 +434,9 @@ ...@@ -426,6 +434,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
<if test="record.content != null"> <if test="record.content != null">
content = #{record.content,jdbcType=LONGVARCHAR}, content = #{record.content,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -450,6 +461,7 @@ ...@@ -450,6 +461,7 @@
goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER},
content = #{record.content,jdbcType=LONGVARCHAR} content = #{record.content,jdbcType=LONGVARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -470,7 +482,8 @@ ...@@ -470,7 +482,8 @@
sort_order = #{record.sortOrder,jdbcType=INTEGER}, sort_order = #{record.sortOrder,jdbcType=INTEGER},
goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, goods = #{record.goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -509,6 +522,9 @@ ...@@ -509,6 +522,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
<if test="content != null"> <if test="content != null">
content = #{content,jdbcType=LONGVARCHAR}, content = #{content,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -530,6 +546,7 @@ ...@@ -530,6 +546,7 @@
goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER},
content = #{content,jdbcType=LONGVARCHAR} content = #{content,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -547,7 +564,8 @@ ...@@ -547,7 +564,8 @@
sort_order = #{sortOrder,jdbcType=INTEGER}, sort_order = #{sortOrder,jdbcType=INTEGER},
goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler}, goods = #{goods,jdbcType=VARCHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallTopicExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallTopicExample" resultMap="BaseResultMap">
...@@ -601,7 +619,7 @@ ...@@ -601,7 +619,7 @@
</when> </when>
<otherwise> <otherwise>
id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted, id, title, subtitle, price, read_count, pic_url, sort_order, goods, add_time, deleted,
content version, content
</otherwise> </otherwise>
</choose> </choose>
from litemall_topic from litemall_topic
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserFormidMapper.xml
View file @ 576c885f
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<result column="useAmount" jdbcType="INTEGER" property="useamount" /> <result column="useAmount" jdbcType="INTEGER" property="useamount" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" /> <result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
<result column="openId" jdbcType="VARCHAR" property="openid" /> <result column="openId" jdbcType="VARCHAR" property="openid" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, formId, isprepay, useAmount, expire_time, openId id, formId, isprepay, useAmount, expire_time, openId, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -121,7 +122,7 @@ ...@@ -121,7 +122,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, formId, isprepay, useAmount, expire_time, openId id, formId, isprepay, useAmount, expire_time, openId, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user_formid from litemall_user_formid
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, formId, isprepay, useAmount, expire_time, openId id, formId, isprepay, useAmount, expire_time, openId, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user_formid from litemall_user_formid
...@@ -189,9 +190,11 @@ ...@@ -189,9 +190,11 @@
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into litemall_user_formid (formId, isprepay, useAmount, insert into litemall_user_formid (formId, isprepay, useAmount,
expire_time, openId) expire_time, openId, version
)
values (#{formid,jdbcType=VARCHAR}, #{isprepay,jdbcType=BIT}, #{useamount,jdbcType=INTEGER}, values (#{formid,jdbcType=VARCHAR}, #{isprepay,jdbcType=BIT}, #{useamount,jdbcType=INTEGER},
#{expireTime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}) #{expireTime,jdbcType=TIMESTAMP}, #{openid,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormid"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormid">
<!-- <!--
...@@ -218,6 +221,9 @@ ...@@ -218,6 +221,9 @@
<if test="openid != null"> <if test="openid != null">
openId, openId,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="formid != null"> <if test="formid != null">
...@@ -235,6 +241,9 @@ ...@@ -235,6 +241,9 @@
<if test="openid != null"> <if test="openid != null">
#{openid,jdbcType=VARCHAR}, #{openid,jdbcType=VARCHAR},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultType="java.lang.Long">
...@@ -272,6 +281,9 @@ ...@@ -272,6 +281,9 @@
<if test="record.openid != null"> <if test="record.openid != null">
openId = #{record.openid,jdbcType=VARCHAR}, openId = #{record.openid,jdbcType=VARCHAR},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -288,7 +300,8 @@ ...@@ -288,7 +300,8 @@
isprepay = #{record.isprepay,jdbcType=BIT}, isprepay = #{record.isprepay,jdbcType=BIT},
useAmount = #{record.useamount,jdbcType=INTEGER}, useAmount = #{record.useamount,jdbcType=INTEGER},
expire_time = #{record.expireTime,jdbcType=TIMESTAMP}, expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
openId = #{record.openid,jdbcType=VARCHAR} openId = #{record.openid,jdbcType=VARCHAR},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -315,6 +328,9 @@ ...@@ -315,6 +328,9 @@
<if test="openid != null"> <if test="openid != null">
openId = #{openid,jdbcType=VARCHAR}, openId = #{openid,jdbcType=VARCHAR},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -328,7 +344,8 @@ ...@@ -328,7 +344,8 @@
isprepay = #{isprepay,jdbcType=BIT}, isprepay = #{isprepay,jdbcType=BIT},
useAmount = #{useamount,jdbcType=INTEGER}, useAmount = #{useamount,jdbcType=INTEGER},
expire_time = #{expireTime,jdbcType=TIMESTAMP}, expire_time = #{expireTime,jdbcType=TIMESTAMP},
openId = #{openid,jdbcType=VARCHAR} openId = #{openid,jdbcType=VARCHAR},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserFormidExample" resultMap="BaseResultMap">
...@@ -362,7 +379,7 @@ ...@@ -362,7 +379,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, formId, isprepay, useAmount, expire_time, openId id, formId, isprepay, useAmount, expire_time, openId, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user_formid from litemall_user_formid
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
View file @ 576c885f
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -94,7 +95,7 @@ ...@@ -94,7 +95,7 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted, version
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user from litemall_user
...@@ -192,7 +193,7 @@ ...@@ -192,7 +193,7 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user from litemall_user
...@@ -228,12 +229,14 @@ ...@@ -228,12 +229,14 @@
birthday, last_login_time, last_login_ip, birthday, last_login_time, last_login_ip,
user_level, nickname, mobile, user_level, nickname, mobile,
avatar, weixin_openid, `status`, avatar, weixin_openid, `status`,
add_time, deleted) add_time, deleted, version
)
values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT},
#{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR}, #{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR},
#{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}) #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{version,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUser"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUser">
<!-- <!--
...@@ -287,6 +290,9 @@ ...@@ -287,6 +290,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="version != null">
version,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="username != null"> <if test="username != null">
...@@ -331,6 +337,9 @@ ...@@ -331,6 +337,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
#{version,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultType="java.lang.Long">
...@@ -395,6 +404,9 @@ ...@@ -395,6 +404,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.version != null">
version = #{record.version,jdbcType=INTEGER},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -420,7 +432,8 @@ ...@@ -420,7 +432,8 @@
weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=TINYINT}, `status` = #{record.status,jdbcType=TINYINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT},
version = #{record.version,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -474,6 +487,9 @@ ...@@ -474,6 +487,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
<if test="version != null">
version = #{version,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -496,7 +512,8 @@ ...@@ -496,7 +512,8 @@
weixin_openid = #{weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{weixinOpenid,jdbcType=VARCHAR},
`status` = #{status,jdbcType=TINYINT}, `status` = #{status,jdbcType=TINYINT},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT},
version = #{version,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap">
...@@ -531,7 +548,7 @@ ...@@ -531,7 +548,7 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted, version
</otherwise> </otherwise>
</choose> </choose>
from litemall_user from litemall_user
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment