Skip to content
GitLab
Commit 4ff5534f authored by Junling Bu's avatar Junling Bu
Browse files

update[all]: 在数据库的（除了region几个表）每个表中添加add_time和delete属性。

parent 4b49c3b2
Hide whitespace changes
Inline Side-by-side
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="order_id" jdbcType="INTEGER" property="orderId" />
......@@ -18,12 +18,14 @@
<result column="goods_specification_values" jdbcType="VARCHAR" property="goodsSpecificationValues" />
<result column="goods_specification_ids" jdbcType="CHAR" property="goodsSpecificationIds" typeHandler="org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler" />
<result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -76,7 +78,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -129,16 +131,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, retail_price,
goods_specification_values, goods_specification_ids, pic_url
goods_specification_values, goods_specification_ids, pic_url, add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<if test="distinct">
......@@ -178,7 +180,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -202,7 +204,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_order_goods
where id = #{id,jdbcType=INTEGER}
......@@ -211,7 +213,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_order_goods
<if test="_parameter != null">
......@@ -222,7 +224,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -231,18 +233,20 @@
goods_sn, product_id, `number`,
retail_price, goods_specification_values,
goods_specification_ids,
pic_url)
pic_url, add_time, deleted
)
values (#{orderId,jdbcType=INTEGER}, #{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR},
#{goodsSn,jdbcType=VARCHAR}, #{productId,jdbcType=INTEGER}, #{number,jdbcType=SMALLINT},
#{retailPrice,jdbcType=DECIMAL}, #{goodsSpecificationValues,jdbcType=VARCHAR},
#{goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
#{picUrl,jdbcType=VARCHAR})
#{picUrl,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
)
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoods">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -279,6 +283,12 @@
<if test="picUrl != null">
pic_url,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">
......@@ -311,13 +321,19 @@
<if test="picUrl != null">
#{picUrl,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select count(*) from litemall_order_goods
<if test="_parameter != null">
......@@ -328,7 +344,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order_goods
<set>
......@@ -365,6 +381,12 @@
<if test="record.picUrl != null">
pic_url = #{record.picUrl,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -374,7 +396,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order_goods
set id = #{record.id,jdbcType=INTEGER},
......@@ -387,7 +409,9 @@
retail_price = #{record.retailPrice,jdbcType=DECIMAL},
goods_specification_values = #{record.goodsSpecificationValues,jdbcType=VARCHAR},
goods_specification_ids = #{record.goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
pic_url = #{record.picUrl,jdbcType=VARCHAR}
pic_url = #{record.picUrl,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -396,7 +420,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order_goods
<set>
......@@ -430,6 +454,12 @@
<if test="picUrl != null">
pic_url = #{picUrl,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -437,7 +467,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order_goods
set order_id = #{orderId,jdbcType=INTEGER},
......@@ -449,7 +479,9 @@
retail_price = #{retailPrice,jdbcType=DECIMAL},
goods_specification_values = #{goodsSpecificationValues,jdbcType=VARCHAR},
goods_specification_ids = #{goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
pic_url = #{picUrl,jdbcType=VARCHAR}
pic_url = #{picUrl,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderGoodsExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml
View file @ 4ff5534f
......@@ -5,12 +5,11 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="user_id" jdbcType="INTEGER" property="userId" />
<result column="order_sn" jdbcType="VARCHAR" property="orderSn" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="order_status" jdbcType="SMALLINT" property="orderStatus" />
<result column="is_delete" jdbcType="BIT" property="isDelete" />
<result column="consignee" jdbcType="VARCHAR" property="consignee" />
......@@ -31,12 +30,14 @@
<result column="ship_end_time" jdbcType="TIMESTAMP" property="shipEndTime" />
<result column="confirm_time" jdbcType="TIMESTAMP" property="confirmTime" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -70,7 +71,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -104,18 +105,18 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
id, user_id, order_sn, add_time, order_status, is_delete, consignee, mobile, address,
goods_price, freight_price, coupon_price, integral_price, order_price, actual_price,
pay_id, pay_status, pay_time, ship_sn, ship_channel, ship_start_time, ship_end_time,
confirm_time, end_time
id, user_id, order_sn, order_status, is_delete, consignee, mobile, address, goods_price,
freight_price, coupon_price, integral_price, order_price, actual_price, pay_id, pay_status,
pay_time, ship_sn, ship_channel, ship_start_time, ship_end_time, confirm_time, end_time,
add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<if test="distinct">
......@@ -155,7 +156,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -179,7 +180,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_order
where id = #{id,jdbcType=INTEGER}
......@@ -188,7 +189,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_order
<if test="_parameter != null">
......@@ -199,33 +200,35 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_order (user_id, order_sn, add_time,
order_status, is_delete, consignee,
mobile, address, goods_price,
freight_price, coupon_price, integral_price,
order_price, actual_price, pay_id,
pay_status, pay_time, ship_sn,
ship_channel, ship_start_time, ship_end_time,
confirm_time, end_time)
values (#{userId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP},
#{orderStatus,jdbcType=SMALLINT}, #{isDelete,jdbcType=BIT}, #{consignee,jdbcType=VARCHAR},
#{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL},
#{freightPrice,jdbcType=DECIMAL}, #{couponPrice,jdbcType=DECIMAL}, #{integralPrice,jdbcType=DECIMAL},
#{orderPrice,jdbcType=DECIMAL}, #{actualPrice,jdbcType=DECIMAL}, #{payId,jdbcType=VARCHAR},
#{payStatus,jdbcType=SMALLINT}, #{payTime,jdbcType=TIMESTAMP}, #{shipSn,jdbcType=VARCHAR},
#{shipChannel,jdbcType=VARCHAR}, #{shipStartTime,jdbcType=TIMESTAMP}, #{shipEndTime,jdbcType=TIMESTAMP},
#{confirmTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP})
insert into litemall_order (user_id, order_sn, order_status,
is_delete, consignee, mobile,
address, goods_price, freight_price,
coupon_price, integral_price, order_price,
actual_price, pay_id, pay_status,
pay_time, ship_sn, ship_channel,
ship_start_time, ship_end_time, confirm_time,
end_time, add_time, deleted
)
values (#{userId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{orderStatus,jdbcType=SMALLINT},
#{isDelete,jdbcType=BIT}, #{consignee,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, #{freightPrice,jdbcType=DECIMAL},
#{couponPrice,jdbcType=DECIMAL}, #{integralPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL},
#{actualPrice,jdbcType=DECIMAL}, #{payId,jdbcType=VARCHAR}, #{payStatus,jdbcType=SMALLINT},
#{payTime,jdbcType=TIMESTAMP}, #{shipSn,jdbcType=VARCHAR}, #{shipChannel,jdbcType=VARCHAR},
#{shipStartTime,jdbcType=TIMESTAMP}, #{shipEndTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP},
#{endTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
)
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrder">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -238,9 +241,6 @@
<if test="orderSn != null">
order_sn,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="orderStatus != null">
order_status,
</if>
......@@ -301,6 +301,12 @@
<if test="endTime != null">
end_time,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">
......@@ -309,9 +315,6 @@
<if test="orderSn != null">
#{orderSn,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="orderStatus != null">
#{orderStatus,jdbcType=SMALLINT},
</if>
......@@ -372,13 +375,19 @@
<if test="endTime != null">
#{endTime,jdbcType=TIMESTAMP},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select count(*) from litemall_order
<if test="_parameter != null">
......@@ -389,7 +398,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order
<set>
......@@ -402,9 +411,6 @@
<if test="record.orderSn != null">
order_sn = #{record.orderSn,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.orderStatus != null">
order_status = #{record.orderStatus,jdbcType=SMALLINT},
</if>
......@@ -465,6 +471,12 @@
<if test="record.endTime != null">
end_time = #{record.endTime,jdbcType=TIMESTAMP},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -474,13 +486,12 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order
set id = #{record.id,jdbcType=INTEGER},
user_id = #{record.userId,jdbcType=INTEGER},
order_sn = #{record.orderSn,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
order_status = #{record.orderStatus,jdbcType=SMALLINT},
is_delete = #{record.isDelete,jdbcType=BIT},
consignee = #{record.consignee,jdbcType=VARCHAR},
......@@ -500,7 +511,9 @@
ship_start_time = #{record.shipStartTime,jdbcType=TIMESTAMP},
ship_end_time = #{record.shipEndTime,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},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -509,7 +522,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order
<set>
......@@ -519,9 +532,6 @@
<if test="orderSn != null">
order_sn = #{orderSn,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="orderStatus != null">
order_status = #{orderStatus,jdbcType=SMALLINT},
</if>
......@@ -582,6 +592,12 @@
<if test="endTime != null">
end_time = #{endTime,jdbcType=TIMESTAMP},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -589,12 +605,11 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_order
set user_id = #{userId,jdbcType=INTEGER},
order_sn = #{orderSn,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
order_status = #{orderStatus,jdbcType=SMALLINT},
is_delete = #{isDelete,jdbcType=BIT},
consignee = #{consignee,jdbcType=VARCHAR},
......@@ -614,7 +629,9 @@
ship_start_time = #{shipStartTime,jdbcType=TIMESTAMP},
ship_end_time = #{shipEndTime,jdbcType=TIMESTAMP},
confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
end_time = #{endTime,jdbcType=TIMESTAMP}
end_time = #{endTime,jdbcType=TIMESTAMP},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallProductMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="goods_id" jdbcType="INTEGER" property="goodsId" />
......@@ -13,12 +13,14 @@
<result column="goods_number" jdbcType="INTEGER" property="goodsNumber" />
<result column="retail_price" jdbcType="DECIMAL" property="retailPrice" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -71,7 +73,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -124,15 +126,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
id, goods_id, goods_specification_ids, goods_number, retail_price, url
id, goods_id, goods_specification_ids, goods_number, retail_price, url, add_time,
deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<if test="distinct">
......@@ -172,7 +175,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -196,7 +199,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_product
where id = #{id,jdbcType=INTEGER}
......@@ -205,7 +208,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
delete from litemall_product
<if test="_parameter != null">
......@@ -216,23 +219,23 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_product (goods_id, goods_specification_ids,
goods_number, retail_price, url
)
goods_number, retail_price, url,
add_time, deleted)
values (#{goodsId,jdbcType=INTEGER}, #{goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
#{goodsNumber,jdbcType=INTEGER}, #{retailPrice,jdbcType=DECIMAL}, #{url,jdbcType=VARCHAR}
)
#{goodsNumber,jdbcType=INTEGER}, #{retailPrice,jdbcType=DECIMAL}, #{url,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallProduct">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -254,6 +257,12 @@
<if test="url != null">
url,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="goodsId != null">
......@@ -271,13 +280,19 @@
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
select count(*) from litemall_product
<if test="_parameter != null">
......@@ -288,7 +303,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_product
<set>
......@@ -310,6 +325,12 @@
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -319,7 +340,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_product
set id = #{record.id,jdbcType=INTEGER},
......@@ -327,7 +348,9 @@
goods_specification_ids = #{record.goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
goods_number = #{record.goodsNumber,jdbcType=INTEGER},
retail_price = #{record.retailPrice,jdbcType=DECIMAL},
url = #{record.url,jdbcType=VARCHAR}
url = #{record.url,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -336,7 +359,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_product
<set>
......@@ -355,6 +378,12 @@
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -362,14 +391,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:36 CST 2018.
-->
update litemall_product
set goods_id = #{goodsId,jdbcType=INTEGER},
goods_specification_ids = #{goodsSpecificationIds,jdbcType=CHAR,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler},
goods_number = #{goodsNumber,jdbcType=INTEGER},
retail_price = #{retailPrice,jdbcType=DECIMAL},
url = #{url,jdbcType=VARCHAR}
url = #{url,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallProductExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionAreaMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<result column="code" jdbcType="INTEGER" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
......@@ -16,7 +16,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -50,7 +50,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -84,7 +84,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
code, `name`, city_code, province_code
</sql>
......@@ -92,7 +92,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -132,7 +132,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_area
<if test="_parameter != null">
......@@ -143,7 +143,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -157,7 +157,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -190,7 +190,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_region_area
<if test="_parameter != null">
......@@ -201,7 +201,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_area
<set>
......@@ -226,7 +226,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_area
set code = #{record.code,jdbcType=INTEGER},
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionCityMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="code" jdbcType="INTEGER" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
......@@ -15,7 +15,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -49,7 +49,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -83,7 +83,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
code, `name`, province_code
</sql>
......@@ -91,7 +91,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -131,7 +131,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -155,7 +155,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_city
where code = #{code,jdbcType=INTEGER}
......@@ -164,7 +164,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_city
<if test="_parameter != null">
......@@ -175,7 +175,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -187,7 +187,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -214,7 +214,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_region_city
<if test="_parameter != null">
......@@ -225,7 +225,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_city
<set>
......@@ -247,7 +247,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_city
set code = #{record.code,jdbcType=INTEGER},
......@@ -261,7 +261,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_city
<set>
......@@ -278,7 +278,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_city
set `name` = #{name,jdbcType=VARCHAR},
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="pid" jdbcType="INTEGER" property="pid" />
......@@ -17,7 +17,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -51,7 +51,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -85,7 +85,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, pid, `name`, `type`, code
</sql>
......@@ -93,7 +93,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -133,7 +133,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -157,7 +157,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region
where id = #{id,jdbcType=INTEGER}
......@@ -166,7 +166,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region
<if test="_parameter != null">
......@@ -177,7 +177,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -191,7 +191,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -230,7 +230,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_region
<if test="_parameter != null">
......@@ -241,7 +241,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region
<set>
......@@ -269,7 +269,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region
set id = #{record.id,jdbcType=INTEGER},
......@@ -285,7 +285,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region
<set>
......@@ -308,7 +308,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region
set pid = #{pid,jdbcType=INTEGER},
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionProvinceMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="code" jdbcType="INTEGER" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
......@@ -14,7 +14,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -48,7 +48,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -82,7 +82,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
code, `name`
</sql>
......@@ -90,7 +90,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -130,7 +130,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -154,7 +154,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_province
where code = #{code,jdbcType=INTEGER}
......@@ -163,7 +163,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_province
<if test="_parameter != null">
......@@ -174,7 +174,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -186,7 +186,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -207,7 +207,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_region_province
<if test="_parameter != null">
......@@ -218,7 +218,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_province
<set>
......@@ -237,7 +237,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_province
set code = #{record.code,jdbcType=INTEGER},
......@@ -250,7 +250,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_province
<set>
......@@ -264,7 +264,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_province
set `name` = #{name,jdbcType=VARCHAR}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionStreetMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<result column="code" jdbcType="INTEGER" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
......@@ -17,7 +17,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -51,7 +51,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -85,7 +85,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
code, `name`, area_code, province_code, city_code
</sql>
......@@ -93,7 +93,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -133,7 +133,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_region_street
<if test="_parameter != null">
......@@ -144,7 +144,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -158,7 +158,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="code" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -197,7 +197,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_region_street
<if test="_parameter != null">
......@@ -208,7 +208,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_street
<set>
......@@ -236,7 +236,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_region_street
set code = #{record.code,jdbcType=INTEGER},
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml
View file @ 4ff5534f
......@@ -5,19 +5,20 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="user_id" jdbcType="INTEGER" property="userId" />
<result column="keyword" jdbcType="CHAR" property="keyword" />
<result column="from" jdbcType="VARCHAR" property="from" />
<result column="add_time" jdbcType="DATE" property="addTime" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -51,7 +52,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -85,15 +86,15 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, user_id, keyword, `from`, add_time
id, user_id, keyword, `from`, add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -133,7 +134,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -157,7 +158,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_search_history
where id = #{id,jdbcType=INTEGER}
......@@ -166,7 +167,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_search_history
<if test="_parameter != null">
......@@ -177,21 +178,21 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_search_history (user_id, keyword, `from`,
add_time)
add_time, deleted)
values (#{userId,jdbcType=INTEGER}, #{keyword,jdbcType=CHAR}, #{from,jdbcType=VARCHAR},
#{addTime,jdbcType=DATE})
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistory">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -210,6 +211,9 @@
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">
......@@ -222,7 +226,10 @@
#{from,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=DATE},
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
......@@ -230,7 +237,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_search_history
<if test="_parameter != null">
......@@ -241,7 +248,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_search_history
<set>
......@@ -258,7 +265,10 @@
`from` = #{record.from,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=DATE},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
......@@ -269,14 +279,15 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_search_history
set id = #{record.id,jdbcType=INTEGER},
user_id = #{record.userId,jdbcType=INTEGER},
keyword = #{record.keyword,jdbcType=CHAR},
`from` = #{record.from,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=DATE}
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -285,7 +296,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_search_history
<set>
......@@ -299,7 +310,10 @@
`from` = #{from,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=DATE},
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
......@@ -308,13 +322,14 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_search_history
set user_id = #{userId,jdbcType=INTEGER},
keyword = #{keyword,jdbcType=CHAR},
`from` = #{from,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=DATE}
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallSearchHistoryExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallStorageMapper.xml
View file @ 4ff5534f
......@@ -5,21 +5,23 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="key" jdbcType="VARCHAR" property="key" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="size" jdbcType="INTEGER" property="size" />
<result column="modified" jdbcType="DATE" property="modified" />
<result column="modified" jdbcType="TIMESTAMP" property="modified" />
<result column="url" jdbcType="VARCHAR" property="url" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -53,7 +55,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -87,15 +89,15 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, `key`, `name`, `type`, `size`, modified, url
id, `key`, `name`, `type`, `size`, modified, url, add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -135,7 +137,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -159,7 +161,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_storage
where id = #{id,jdbcType=INTEGER}
......@@ -168,7 +170,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_storage
<if test="_parameter != null">
......@@ -179,21 +181,23 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_storage (`key`, `name`, `type`,
`size`, modified, url)
`size`, modified, url,
add_time, deleted)
values (#{key,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR},
#{size,jdbcType=INTEGER}, #{modified,jdbcType=DATE}, #{url,jdbcType=VARCHAR})
#{size,jdbcType=INTEGER}, #{modified,jdbcType=TIMESTAMP}, #{url,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallStorage">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -218,6 +222,12 @@
<if test="url != null">
url,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="key != null">
......@@ -233,18 +243,24 @@
#{size,jdbcType=INTEGER},
</if>
<if test="modified != null">
#{modified,jdbcType=DATE},
#{modified,jdbcType=TIMESTAMP},
</if>
<if test="url != null">
#{url,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_storage
<if test="_parameter != null">
......@@ -255,7 +271,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_storage
<set>
......@@ -275,11 +291,17 @@
`size` = #{record.size,jdbcType=INTEGER},
</if>
<if test="record.modified != null">
modified = #{record.modified,jdbcType=DATE},
modified = #{record.modified,jdbcType=TIMESTAMP},
</if>
<if test="record.url != null">
url = #{record.url,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -289,7 +311,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_storage
set id = #{record.id,jdbcType=INTEGER},
......@@ -297,8 +319,10 @@
`name` = #{record.name,jdbcType=VARCHAR},
`type` = #{record.type,jdbcType=VARCHAR},
`size` = #{record.size,jdbcType=INTEGER},
modified = #{record.modified,jdbcType=DATE},
url = #{record.url,jdbcType=VARCHAR}
modified = #{record.modified,jdbcType=TIMESTAMP},
url = #{record.url,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -307,7 +331,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_storage
<set>
......@@ -324,11 +348,17 @@
`size` = #{size,jdbcType=INTEGER},
</if>
<if test="modified != null">
modified = #{modified,jdbcType=DATE},
modified = #{modified,jdbcType=TIMESTAMP},
</if>
<if test="url != null">
url = #{url,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -336,15 +366,17 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_storage
set `key` = #{key,jdbcType=VARCHAR},
`name` = #{name,jdbcType=VARCHAR},
`type` = #{type,jdbcType=VARCHAR},
`size` = #{size,jdbcType=INTEGER},
modified = #{modified,jdbcType=DATE},
url = #{url,jdbcType=VARCHAR}
modified = #{modified,jdbcType=TIMESTAMP},
url = #{url,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallStorageExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallTopicMapper.xml
View file @ 4ff5534f
......@@ -5,7 +5,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<result column="id" jdbcType="INTEGER" property="id" />
<result column="title" jdbcType="VARCHAR" property="title" />
......@@ -17,12 +17,14 @@
<result column="scene_pic_url" jdbcType="VARCHAR" property="scenePicUrl" />
<result column="sort_order" jdbcType="INTEGER" property="sortOrder" />
<result column="is_show" jdbcType="BIT" property="isShow" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="org.linlinjava.litemall.db.domain.LitemallTopic">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<result column="content" jdbcType="LONGVARCHAR" property="content" />
</resultMap>
......@@ -30,7 +32,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -64,7 +66,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -98,16 +100,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, title, avatar, item_pic_url, subtitle, price_info, read_count, scene_pic_url,
sort_order, is_show
sort_order, is_show, add_time, deleted
</sql>
<sql id="Blob_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
content
</sql>
......@@ -115,7 +117,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -136,7 +138,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -176,7 +178,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_topic
<if test="_parameter != null">
......@@ -187,7 +189,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -195,17 +197,19 @@
insert into litemall_topic (title, avatar, item_pic_url,
subtitle, price_info, read_count,
scene_pic_url, sort_order, is_show,
content)
add_time, deleted, content
)
values (#{title,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, #{itemPicUrl,jdbcType=VARCHAR},
#{subtitle,jdbcType=VARCHAR}, #{priceInfo,jdbcType=DECIMAL}, #{readCount,jdbcType=VARCHAR},
#{scenePicUrl,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER}, #{isShow,jdbcType=BIT},
#{content,jdbcType=LONGVARCHAR})
#{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{content,jdbcType=LONGVARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallTopic">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -239,6 +243,12 @@
<if test="isShow != null">
is_show,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
<if test="content != null">
content,
</if>
......@@ -271,6 +281,12 @@
<if test="isShow != null">
#{isShow,jdbcType=BIT},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
<if test="content != null">
#{content,jdbcType=LONGVARCHAR},
</if>
......@@ -280,7 +296,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_topic
<if test="_parameter != null">
......@@ -291,7 +307,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_topic
<set>
......@@ -325,6 +341,12 @@
<if test="record.isShow != null">
is_show = #{record.isShow,jdbcType=BIT},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
<if test="record.content != null">
content = #{record.content,jdbcType=LONGVARCHAR},
</if>
......@@ -337,7 +359,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_topic
set id = #{record.id,jdbcType=INTEGER},
......@@ -350,6 +372,8 @@
scene_pic_url = #{record.scenePicUrl,jdbcType=VARCHAR},
sort_order = #{record.sortOrder,jdbcType=INTEGER},
is_show = #{record.isShow,jdbcType=BIT},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT},
content = #{record.content,jdbcType=LONGVARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -359,7 +383,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_topic
set id = #{record.id,jdbcType=INTEGER},
......@@ -371,7 +395,9 @@
read_count = #{record.readCount,jdbcType=VARCHAR},
scene_pic_url = #{record.scenePicUrl,jdbcType=VARCHAR},
sort_order = #{record.sortOrder,jdbcType=INTEGER},
is_show = #{record.isShow,jdbcType=BIT}
is_show = #{record.isShow,jdbcType=BIT},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.xml
View file @ 4ff5534f
......@@ -5,19 +5,21 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="coupon_id" jdbcType="INTEGER" property="couponId" />
<result column="user_id" jdbcType="INTEGER" property="userId" />
<result column="order_id" jdbcType="INTEGER" property="orderId" />
<result column="used_time" jdbcType="TIMESTAMP" property="usedTime" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -51,7 +53,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -85,15 +87,15 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, coupon_id, user_id, order_id, used_time
id, coupon_id, user_id, order_id, used_time, add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserCouponExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -133,7 +135,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -157,7 +159,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_user_coupon
where id = #{id,jdbcType=INTEGER}
......@@ -166,7 +168,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_user_coupon
<if test="_parameter != null">
......@@ -177,21 +179,23 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_user_coupon (coupon_id, user_id, order_id,
used_time)
used_time, add_time, deleted
)
values (#{couponId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER},
#{usedTime,jdbcType=TIMESTAMP})
#{usedTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
)
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUserCoupon">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -210,6 +214,12 @@
<if test="usedTime != null">
used_time,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="couponId != null">
......@@ -224,13 +234,19 @@
<if test="usedTime != null">
#{usedTime,jdbcType=TIMESTAMP},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserCouponExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_user_coupon
<if test="_parameter != null">
......@@ -241,7 +257,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user_coupon
<set>
......@@ -260,6 +276,12 @@
<if test="record.usedTime != null">
used_time = #{record.usedTime,jdbcType=TIMESTAMP},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -269,14 +291,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user_coupon
set id = #{record.id,jdbcType=INTEGER},
coupon_id = #{record.couponId,jdbcType=INTEGER},
user_id = #{record.userId,jdbcType=INTEGER},
order_id = #{record.orderId,jdbcType=INTEGER},
used_time = #{record.usedTime,jdbcType=TIMESTAMP}
used_time = #{record.usedTime,jdbcType=TIMESTAMP},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -285,7 +309,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user_coupon
<set>
......@@ -301,6 +325,12 @@
<if test="usedTime != null">
used_time = #{usedTime,jdbcType=TIMESTAMP},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -308,13 +338,15 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user_coupon
set coupon_id = #{couponId,jdbcType=INTEGER},
user_id = #{userId,jdbcType=INTEGER},
order_id = #{orderId,jdbcType=INTEGER},
used_time = #{usedTime,jdbcType=TIMESTAMP}
used_time = #{usedTime,jdbcType=TIMESTAMP},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserCouponExample" resultMap="BaseResultMap">
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml
View file @ 4ff5534f
......@@ -5,15 +5,14 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="username" jdbcType="VARCHAR" property="username" />
<result column="password" jdbcType="VARCHAR" property="password" />
<result column="gender" jdbcType="VARCHAR" property="gender" />
<result column="birthday" jdbcType="DATE" property="birthday" />
<result column="register_time" jdbcType="DATE" property="registerTime" />
<result column="last_login_time" jdbcType="DATE" property="lastLoginTime" />
<result column="last_login_time" jdbcType="TIMESTAMP" property="lastLoginTime" />
<result column="last_login_ip" jdbcType="VARCHAR" property="lastLoginIp" />
<result column="user_level" jdbcType="VARCHAR" property="userLevel" />
<result column="nickname" jdbcType="VARCHAR" property="nickname" />
......@@ -22,12 +21,14 @@
<result column="avatar" jdbcType="VARCHAR" property="avatar" />
<result column="weixin_openid" jdbcType="VARCHAR" property="weixinOpenid" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
......@@ -61,7 +62,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
......@@ -95,16 +96,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
id, username, `password`, gender, birthday, register_time, last_login_time, last_login_ip,
user_level, nickname, mobile, register_ip, avatar, weixin_openid, `status`
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, register_ip, avatar, weixin_openid, `status`, add_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<if test="distinct">
......@@ -144,7 +145,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select
<include refid="Base_Column_List" />
......@@ -168,7 +169,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_user
where id = #{id,jdbcType=INTEGER}
......@@ -177,7 +178,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
delete from litemall_user
<if test="_parameter != null">
......@@ -188,27 +189,29 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_user (username, `password`, gender,
birthday, register_time, last_login_time,
last_login_ip, user_level, nickname,
mobile, register_ip, avatar,
weixin_openid, `status`)
birthday, last_login_time, last_login_ip,
user_level, nickname, mobile,
register_ip, avatar, weixin_openid,
`status`, add_time, deleted
)
values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
#{birthday,jdbcType=DATE}, #{registerTime,jdbcType=DATE}, #{lastLoginTime,jdbcType=DATE},
#{lastLoginIp,jdbcType=VARCHAR}, #{userLevel,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR},
#{mobile,jdbcType=VARCHAR}, #{registerIp,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR},
#{weixinOpenid,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR})
#{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR},
#{userLevel,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{registerIp,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
)
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallUser">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
......@@ -227,9 +230,6 @@
<if test="birthday != null">
birthday,
</if>
<if test="registerTime != null">
register_time,
</if>
<if test="lastLoginTime != null">
last_login_time,
</if>
......@@ -257,6 +257,12 @@
<if test="status != null">
`status`,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="deleted != null">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="username != null">
......@@ -271,11 +277,8 @@
<if test="birthday != null">
#{birthday,jdbcType=DATE},
</if>
<if test="registerTime != null">
#{registerTime,jdbcType=DATE},
</if>
<if test="lastLoginTime != null">
#{lastLoginTime,jdbcType=DATE},
#{lastLoginTime,jdbcType=TIMESTAMP},
</if>
<if test="lastLoginIp != null">
#{lastLoginIp,jdbcType=VARCHAR},
......@@ -301,13 +304,19 @@
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
select count(*) from litemall_user
<if test="_parameter != null">
......@@ -318,7 +327,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user
<set>
......@@ -337,11 +346,8 @@
<if test="record.birthday != null">
birthday = #{record.birthday,jdbcType=DATE},
</if>
<if test="record.registerTime != null">
register_time = #{record.registerTime,jdbcType=DATE},
</if>
<if test="record.lastLoginTime != null">
last_login_time = #{record.lastLoginTime,jdbcType=DATE},
last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
</if>
<if test="record.lastLoginIp != null">
last_login_ip = #{record.lastLoginIp,jdbcType=VARCHAR},
......@@ -367,6 +373,12 @@
<if test="record.status != null">
`status` = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -376,7 +388,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user
set id = #{record.id,jdbcType=INTEGER},
......@@ -384,8 +396,7 @@
`password` = #{record.password,jdbcType=VARCHAR},
gender = #{record.gender,jdbcType=VARCHAR},
birthday = #{record.birthday,jdbcType=DATE},
register_time = #{record.registerTime,jdbcType=DATE},
last_login_time = #{record.lastLoginTime,jdbcType=DATE},
last_login_time = #{record.lastLoginTime,jdbcType=TIMESTAMP},
last_login_ip = #{record.lastLoginIp,jdbcType=VARCHAR},
user_level = #{record.userLevel,jdbcType=VARCHAR},
nickname = #{record.nickname,jdbcType=VARCHAR},
......@@ -393,7 +404,9 @@
register_ip = #{record.registerIp,jdbcType=VARCHAR},
avatar = #{record.avatar,jdbcType=VARCHAR},
weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=VARCHAR}
`status` = #{record.status,jdbcType=VARCHAR},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -402,7 +415,7 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user
<set>
......@@ -418,11 +431,8 @@
<if test="birthday != null">
birthday = #{birthday,jdbcType=DATE},
</if>
<if test="registerTime != null">
register_time = #{registerTime,jdbcType=DATE},
</if>
<if test="lastLoginTime != null">
last_login_time = #{lastLoginTime,jdbcType=DATE},
last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
</if>
<if test="lastLoginIp != null">
last_login_ip = #{lastLoginIp,jdbcType=VARCHAR},
......@@ -448,6 +458,12 @@
<if test="status != null">
`status` = #{status,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -455,15 +471,14 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Mar 20 00:11:33 CST 2018.
This element was generated on Fri Apr 06 22:55:37 CST 2018.
-->
update litemall_user
set username = #{username,jdbcType=VARCHAR},
`password` = #{password,jdbcType=VARCHAR},
gender = #{gender,jdbcType=VARCHAR},
birthday = #{birthday,jdbcType=DATE},
register_time = #{registerTime,jdbcType=DATE},
last_login_time = #{lastLoginTime,jdbcType=DATE},
last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP},
last_login_ip = #{lastLoginIp,jdbcType=VARCHAR},
user_level = #{userLevel,jdbcType=VARCHAR},
nickname = #{nickname,jdbcType=VARCHAR},
......@@ -471,7 +486,9 @@
register_ip = #{registerIp,jdbcType=VARCHAR},
avatar = #{avatar,jdbcType=VARCHAR},
weixin_openid = #{weixinOpenid,jdbcType=VARCHAR},
`status` = #{status,jdbcType=VARCHAR}
`status` = #{status,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallUserExample" resultMap="BaseResultMap">
......
litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java
View file @ 4ff5534f
......@@ -16,6 +16,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -81,7 +82,8 @@ public class StorageController {
storageInfo.setName(originalFilename);
storageInfo.setSize((int)file.getSize());
storageInfo.setType(file.getContentType());
storageInfo.setModified(LocalDate.now());
storageInfo.setAddTime(LocalDateTime.now());
storageInfo.setModified(LocalDateTime.now());
storageInfo.setKey(key);
storageInfo.setUrl(url);
zmallStorageService.add(storageInfo);
......
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
View file @ 4ff5534f
......@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -127,12 +128,12 @@ public class WxAuthController {
user.setGender(userInfo.getGender() == 1 ? "男" : "女");
user.setUserLevel("普通用户");
user.setStatus("可用");
user.setLastLoginTime(LocalDate.now());
user.setLastLoginTime(LocalDateTime.now());
user.setLastLoginIp(IpUtil.client(request));
userService.add(user);
}
else{
user.setLastLoginTime(LocalDate.now());
user.setLastLoginTime(LocalDateTime.now());
user.setLastLoginIp(IpUtil.client(request));
userService.update(user);
}
......@@ -186,7 +187,7 @@ public class WxAuthController {
user.setGender("未知");
user.setUserLevel("普通用户");
user.setStatus("可用");
user.setLastLoginTime(LocalDate.now());
user.setLastLoginTime(LocalDateTime.now());
user.setLastLoginIp(IpUtil.client(request));
userService.add(user);
......
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCollectController.java
View file @ 4ff5534f
......@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -95,7 +96,7 @@ public class WxCollectController {
collect.setUserId(userId);
collect.setValueId(valueId);
collect.setTypeId(typeId);
collect.setAddTime(LocalDate.now());
collect.setAddTime(LocalDateTime.now());
collectService.add(collect);
}
......
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCommentController.java
View file @ 4ff5534f
......@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -44,7 +45,7 @@ public class WxCommentController {
return ResponseUtil.fail402();
}
comment.setAddTime(LocalDate.now());
comment.setAddTime(LocalDateTime.now());
comment.setUserId(userId);
commentService.save(comment);
return ResponseUtil.ok(comment);
......
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
View file @ 4ff5534f
......@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -175,7 +176,7 @@ public class WxGoodsController {
//添加到搜索历史
if (userId != null && !StringUtils.isNullOrEmpty(keyword)) {
LitemallSearchHistory searchHistoryVo = new LitemallSearchHistory();
searchHistoryVo.setAddTime(LocalDate.now());
searchHistoryVo.setAddTime(LocalDateTime.now());
searchHistoryVo.setKeyword(keyword);
searchHistoryVo.setUserId(userId);
searchHistoryVo.setFrom("wx");
......
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