Skip to content
GitLab
Unverified Commit 324c8da3 authored by linlinjava's avatar linlinjava Committed by GitHub
Browse files

Merge branch 'master' into dev

parents 693cf5cd 4c46da9b
Hide whitespace changes
Inline Side-by-side
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallCouponUserMapper.xml
View file @ 324c8da3
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -123,12 +122,11 @@ ...@@ -123,12 +122,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time, <include refid="Base_Column_List" />
update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_coupon_user from litemall_coupon_user
...@@ -150,11 +148,6 @@ ...@@ -150,11 +148,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -177,18 +170,16 @@ ...@@ -177,18 +170,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time, <include refid="Base_Column_List" />
update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_coupon_user from litemall_coupon_user
...@@ -441,7 +432,6 @@ ...@@ -441,7 +432,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -458,18 +448,16 @@ ...@@ -458,18 +448,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time, <include refid="Base_Column_List" />
update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_coupon_user from litemall_coupon_user
...@@ -485,7 +473,6 @@ ...@@ -485,7 +473,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_coupon_user set deleted = 1 update litemall_coupon_user set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -496,7 +483,6 @@ ...@@ -496,7 +483,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_coupon_user set deleted = 1 update litemall_coupon_user set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFeedbackMapper.xml
View file @ 324c8da3
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -162,12 +161,11 @@ ...@@ -162,12 +161,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls, <include refid="Base_Column_List" />
add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_feedback from litemall_feedback
...@@ -189,11 +187,6 @@ ...@@ -189,11 +187,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -216,18 +209,16 @@ ...@@ -216,18 +209,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls, <include refid="Base_Column_List" />
add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_feedback from litemall_feedback
...@@ -496,7 +487,6 @@ ...@@ -496,7 +487,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -513,18 +503,16 @@ ...@@ -513,18 +503,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls, <include refid="Base_Column_List" />
add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_feedback from litemall_feedback
...@@ -540,7 +528,6 @@ ...@@ -540,7 +528,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_feedback set deleted = 1 update litemall_feedback set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -551,7 +538,6 @@ ...@@ -551,7 +538,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_feedback set deleted = 1 update litemall_feedback set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml
View file @ 324c8da3
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -117,11 +116,11 @@ ...@@ -117,11 +116,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, goods_id, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_footprint from litemall_footprint
...@@ -143,11 +142,6 @@ ...@@ -143,11 +142,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -170,17 +164,16 @@ ...@@ -170,17 +164,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, goods_id, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_footprint from litemall_footprint
...@@ -359,7 +352,6 @@ ...@@ -359,7 +352,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -376,17 +368,16 @@ ...@@ -376,17 +368,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, goods_id, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_footprint from litemall_footprint
...@@ -402,7 +393,6 @@ ...@@ -402,7 +393,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_footprint set deleted = 1 update litemall_footprint set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -413,7 +403,6 @@ ...@@ -413,7 +403,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_footprint set deleted = 1 update litemall_footprint set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml
View file @ 324c8da3
...@@ -109,7 +109,6 @@ ...@@ -109,7 +109,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -118,11 +117,11 @@ ...@@ -118,11 +117,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_attribute from litemall_goods_attribute
...@@ -144,11 +143,6 @@ ...@@ -144,11 +143,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -171,17 +165,16 @@ ...@@ -171,17 +165,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_attribute from litemall_goods_attribute
...@@ -376,7 +369,6 @@ ...@@ -376,7 +369,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -393,17 +385,16 @@ ...@@ -393,17 +385,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_attribute from litemall_goods_attribute
...@@ -419,7 +410,6 @@ ...@@ -419,7 +410,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_attribute set deleted = 1 update litemall_goods_attribute set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -430,7 +420,6 @@ ...@@ -430,7 +420,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_attribute set deleted = 1 update litemall_goods_attribute set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
View file @ 324c8da3
...@@ -196,7 +196,6 @@ ...@@ -196,7 +196,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -205,13 +204,13 @@ ...@@ -205,13 +204,13 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale, <include refid="Base_Column_List" />
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price, ,
add_time, update_time, deleted, detail <include refid="Blob_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods from litemall_goods
...@@ -235,11 +234,6 @@ ...@@ -235,11 +234,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="ResultMapWithBLOBs"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="ResultMapWithBLOBs">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -264,19 +258,18 @@ ...@@ -264,19 +258,18 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale, <include refid="Base_Column_List" />
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price, ,
add_time, update_time, deleted, detail <include refid="Blob_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods from litemall_goods
...@@ -732,7 +725,6 @@ ...@@ -732,7 +725,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -749,7 +741,6 @@ ...@@ -749,7 +741,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -768,19 +759,18 @@ ...@@ -768,19 +759,18 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale, <include refid="Base_Column_List" />
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price, ,
add_time, update_time, deleted, detail <include refid="Blob_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods from litemall_goods
...@@ -796,7 +786,6 @@ ...@@ -796,7 +786,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods set deleted = 1 update litemall_goods set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -807,7 +796,6 @@ ...@@ -807,7 +796,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods set deleted = 1 update litemall_goods set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsProductMapper.xml
View file @ 324c8da3
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -158,12 +157,11 @@ ...@@ -158,12 +157,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_product from litemall_goods_product
...@@ -185,11 +183,6 @@ ...@@ -185,11 +183,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -212,18 +205,16 @@ ...@@ -212,18 +205,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_product from litemall_goods_product
...@@ -448,7 +439,6 @@ ...@@ -448,7 +439,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -465,18 +455,16 @@ ...@@ -465,18 +455,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_product from litemall_goods_product
...@@ -492,7 +480,6 @@ ...@@ -492,7 +480,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_product set deleted = 1 update litemall_goods_product set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -503,7 +490,6 @@ ...@@ -503,7 +490,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_product set deleted = 1 update litemall_goods_product set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsSpecificationMapper.xml
View file @ 324c8da3
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -119,11 +118,11 @@ ...@@ -119,11 +118,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_specification from litemall_goods_specification
...@@ -145,11 +144,6 @@ ...@@ -145,11 +144,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -172,17 +166,16 @@ ...@@ -172,17 +166,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_specification from litemall_goods_specification
...@@ -391,7 +384,6 @@ ...@@ -391,7 +384,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -408,17 +400,16 @@ ...@@ -408,17 +400,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_goods_specification from litemall_goods_specification
...@@ -434,7 +425,6 @@ ...@@ -434,7 +425,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_specification set deleted = 1 update litemall_goods_specification set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -445,7 +435,6 @@ ...@@ -445,7 +435,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_goods_specification set deleted = 1 update litemall_goods_specification set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGrouponMapper.xml
View file @ 324c8da3
...@@ -11,11 +11,12 @@ ...@@ -11,11 +11,12 @@
<result column="groupon_id" jdbcType="INTEGER" property="grouponId" /> <result column="groupon_id" jdbcType="INTEGER" property="grouponId" />
<result column="rules_id" jdbcType="INTEGER" property="rulesId" /> <result column="rules_id" jdbcType="INTEGER" property="rulesId" />
<result column="user_id" jdbcType="INTEGER" property="userId" /> <result column="user_id" jdbcType="INTEGER" property="userId" />
<result column="share_url" jdbcType="VARCHAR" property="shareUrl" />
<result column="creator_user_id" jdbcType="INTEGER" property="creatorUserId" /> <result column="creator_user_id" jdbcType="INTEGER" property="creatorUserId" />
<result column="creator_user_time" jdbcType="TIMESTAMP" property="creatorUserTime" />
<result column="status" jdbcType="SMALLINT" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="share_url" jdbcType="VARCHAR" property="shareUrl" />
<result column="payed" jdbcType="BIT" property="payed" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
...@@ -89,8 +90,8 @@ ...@@ -89,8 +90,8 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time, id, order_id, groupon_id, rules_id, user_id, share_url, creator_user_id, creator_user_time,
share_url, payed, deleted `status`, add_time, update_time, deleted
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -114,7 +115,6 @@ ...@@ -114,7 +115,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -123,12 +123,11 @@ ...@@ -123,12 +123,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time, <include refid="Base_Column_List" />
share_url, payed, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon from litemall_groupon
...@@ -150,11 +149,6 @@ ...@@ -150,11 +149,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -177,18 +171,16 @@ ...@@ -177,18 +171,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time, <include refid="Base_Column_List" />
share_url, payed, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon from litemall_groupon
...@@ -221,13 +213,13 @@ ...@@ -221,13 +213,13 @@
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into litemall_groupon (order_id, groupon_id, rules_id, insert into litemall_groupon (order_id, groupon_id, rules_id,
user_id, creator_user_id, add_time, user_id, share_url, creator_user_id,
update_time, share_url, payed, creator_user_time, `status`, add_time,
deleted) update_time, deleted)
values (#{orderId,jdbcType=INTEGER}, #{grouponId,jdbcType=INTEGER}, #{rulesId,jdbcType=INTEGER}, values (#{orderId,jdbcType=INTEGER}, #{grouponId,jdbcType=INTEGER}, #{rulesId,jdbcType=INTEGER},
#{userId,jdbcType=INTEGER}, #{creatorUserId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{userId,jdbcType=INTEGER}, #{shareUrl,jdbcType=VARCHAR}, #{creatorUserId,jdbcType=INTEGER},
#{updateTime,jdbcType=TIMESTAMP}, #{shareUrl,jdbcType=VARCHAR}, #{payed,jdbcType=BIT}, #{creatorUserTime,jdbcType=TIMESTAMP}, #{status,jdbcType=SMALLINT}, #{addTime,jdbcType=TIMESTAMP},
#{deleted,jdbcType=BIT}) #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGroupon"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGroupon">
<!-- <!--
...@@ -251,21 +243,24 @@ ...@@ -251,21 +243,24 @@
<if test="userId != null"> <if test="userId != null">
user_id, user_id,
</if> </if>
<if test="shareUrl != null">
share_url,
</if>
<if test="creatorUserId != null"> <if test="creatorUserId != null">
creator_user_id, creator_user_id,
</if> </if>
<if test="creatorUserTime != null">
creator_user_time,
</if>
<if test="status != null">
`status`,
</if>
<if test="addTime != null"> <if test="addTime != null">
add_time, add_time,
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time, update_time,
</if> </if>
<if test="shareUrl != null">
share_url,
</if>
<if test="payed != null">
payed,
</if>
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
...@@ -283,21 +278,24 @@ ...@@ -283,21 +278,24 @@
<if test="userId != null"> <if test="userId != null">
#{userId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER},
</if> </if>
<if test="shareUrl != null">
#{shareUrl,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null"> <if test="creatorUserId != null">
#{creatorUserId,jdbcType=INTEGER}, #{creatorUserId,jdbcType=INTEGER},
</if> </if>
<if test="creatorUserTime != null">
#{creatorUserTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null"> <if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="shareUrl != null">
#{shareUrl,jdbcType=VARCHAR},
</if>
<if test="payed != null">
#{payed,jdbcType=BIT},
</if>
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
...@@ -335,21 +333,24 @@ ...@@ -335,21 +333,24 @@
<if test="record.userId != null"> <if test="record.userId != null">
user_id = #{record.userId,jdbcType=INTEGER}, user_id = #{record.userId,jdbcType=INTEGER},
</if> </if>
<if test="record.shareUrl != null">
share_url = #{record.shareUrl,jdbcType=VARCHAR},
</if>
<if test="record.creatorUserId != null"> <if test="record.creatorUserId != null">
creator_user_id = #{record.creatorUserId,jdbcType=INTEGER}, creator_user_id = #{record.creatorUserId,jdbcType=INTEGER},
</if> </if>
<if test="record.creatorUserTime != null">
creator_user_time = #{record.creatorUserTime,jdbcType=TIMESTAMP},
</if>
<if test="record.status != null">
`status` = #{record.status,jdbcType=SMALLINT},
</if>
<if test="record.addTime != null"> <if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.updateTime != null"> <if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.shareUrl != null">
share_url = #{record.shareUrl,jdbcType=VARCHAR},
</if>
<if test="record.payed != null">
payed = #{record.payed,jdbcType=BIT},
</if>
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
...@@ -369,11 +370,12 @@ ...@@ -369,11 +370,12 @@
groupon_id = #{record.grouponId,jdbcType=INTEGER}, groupon_id = #{record.grouponId,jdbcType=INTEGER},
rules_id = #{record.rulesId,jdbcType=INTEGER}, rules_id = #{record.rulesId,jdbcType=INTEGER},
user_id = #{record.userId,jdbcType=INTEGER}, user_id = #{record.userId,jdbcType=INTEGER},
share_url = #{record.shareUrl,jdbcType=VARCHAR},
creator_user_id = #{record.creatorUserId,jdbcType=INTEGER}, creator_user_id = #{record.creatorUserId,jdbcType=INTEGER},
creator_user_time = #{record.creatorUserTime,jdbcType=TIMESTAMP},
`status` = #{record.status,jdbcType=SMALLINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
share_url = #{record.shareUrl,jdbcType=VARCHAR},
payed = #{record.payed,jdbcType=BIT},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -398,21 +400,24 @@ ...@@ -398,21 +400,24 @@
<if test="userId != null"> <if test="userId != null">
user_id = #{userId,jdbcType=INTEGER}, user_id = #{userId,jdbcType=INTEGER},
</if> </if>
<if test="shareUrl != null">
share_url = #{shareUrl,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null"> <if test="creatorUserId != null">
creator_user_id = #{creatorUserId,jdbcType=INTEGER}, creator_user_id = #{creatorUserId,jdbcType=INTEGER},
</if> </if>
<if test="creatorUserTime != null">
creator_user_time = #{creatorUserTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
`status` = #{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null"> <if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="shareUrl != null">
share_url = #{shareUrl,jdbcType=VARCHAR},
</if>
<if test="payed != null">
payed = #{payed,jdbcType=BIT},
</if>
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
...@@ -429,11 +434,12 @@ ...@@ -429,11 +434,12 @@
groupon_id = #{grouponId,jdbcType=INTEGER}, groupon_id = #{grouponId,jdbcType=INTEGER},
rules_id = #{rulesId,jdbcType=INTEGER}, rules_id = #{rulesId,jdbcType=INTEGER},
user_id = #{userId,jdbcType=INTEGER}, user_id = #{userId,jdbcType=INTEGER},
share_url = #{shareUrl,jdbcType=VARCHAR},
creator_user_id = #{creatorUserId,jdbcType=INTEGER}, creator_user_id = #{creatorUserId,jdbcType=INTEGER},
creator_user_time = #{creatorUserTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=SMALLINT},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
share_url = #{shareUrl,jdbcType=VARCHAR},
payed = #{payed,jdbcType=BIT},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -441,7 +447,6 @@ ...@@ -441,7 +447,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -458,18 +463,16 @@ ...@@ -458,18 +463,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time, <include refid="Base_Column_List" />
share_url, payed, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon from litemall_groupon
...@@ -485,7 +488,6 @@ ...@@ -485,7 +488,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_groupon set deleted = 1 update litemall_groupon set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -496,7 +498,6 @@ ...@@ -496,7 +498,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_groupon set deleted = 1 update litemall_groupon set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGrouponRulesMapper.xml
View file @ 324c8da3
...@@ -12,9 +12,10 @@ ...@@ -12,9 +12,10 @@
<result column="pic_url" jdbcType="VARCHAR" property="picUrl" /> <result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
<result column="discount" jdbcType="DECIMAL" property="discount" /> <result column="discount" jdbcType="DECIMAL" property="discount" />
<result column="discount_member" jdbcType="INTEGER" property="discountMember" /> <result column="discount_member" jdbcType="INTEGER" property="discountMember" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
<result column="status" jdbcType="SMALLINT" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
...@@ -88,8 +89,8 @@ ...@@ -88,8 +89,8 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time, id, goods_id, goods_name, pic_url, discount, discount_member, expire_time, `status`,
expire_time, deleted add_time, update_time, deleted
</sql> </sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRulesExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRulesExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -113,7 +114,6 @@ ...@@ -113,7 +114,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -122,12 +122,11 @@ ...@@ -122,12 +122,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time, <include refid="Base_Column_List" />
expire_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon_rules from litemall_groupon_rules
...@@ -149,11 +148,6 @@ ...@@ -149,11 +148,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -176,18 +170,16 @@ ...@@ -176,18 +170,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time, <include refid="Base_Column_List" />
expire_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon_rules from litemall_groupon_rules
...@@ -220,13 +212,13 @@ ...@@ -220,13 +212,13 @@
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into litemall_groupon_rules (goods_id, goods_name, pic_url, insert into litemall_groupon_rules (goods_id, goods_name, pic_url,
discount, discount_member, add_time, discount, discount_member, expire_time,
update_time, expire_time, deleted `status`, add_time, update_time,
) deleted)
values (#{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR}, values (#{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR},
#{discount,jdbcType=DECIMAL}, #{discountMember,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{discount,jdbcType=DECIMAL}, #{discountMember,jdbcType=INTEGER}, #{expireTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT} #{status,jdbcType=SMALLINT}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
) #{deleted,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRules"> <insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRules">
<!-- <!--
...@@ -253,15 +245,18 @@ ...@@ -253,15 +245,18 @@
<if test="discountMember != null"> <if test="discountMember != null">
discount_member, discount_member,
</if> </if>
<if test="expireTime != null">
expire_time,
</if>
<if test="status != null">
`status`,
</if>
<if test="addTime != null"> <if test="addTime != null">
add_time, add_time,
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time, update_time,
</if> </if>
<if test="expireTime != null">
expire_time,
</if>
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
...@@ -282,15 +277,18 @@ ...@@ -282,15 +277,18 @@
<if test="discountMember != null"> <if test="discountMember != null">
#{discountMember,jdbcType=INTEGER}, #{discountMember,jdbcType=INTEGER},
</if> </if>
<if test="expireTime != null">
#{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null"> <if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="expireTime != null">
#{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
...@@ -331,15 +329,18 @@ ...@@ -331,15 +329,18 @@
<if test="record.discountMember != null"> <if test="record.discountMember != null">
discount_member = #{record.discountMember,jdbcType=INTEGER}, discount_member = #{record.discountMember,jdbcType=INTEGER},
</if> </if>
<if test="record.expireTime != null">
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
</if>
<if test="record.status != null">
`status` = #{record.status,jdbcType=SMALLINT},
</if>
<if test="record.addTime != null"> <if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.updateTime != null"> <if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.expireTime != null">
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
...@@ -360,9 +361,10 @@ ...@@ -360,9 +361,10 @@
pic_url = #{record.picUrl,jdbcType=VARCHAR}, pic_url = #{record.picUrl,jdbcType=VARCHAR},
discount = #{record.discount,jdbcType=DECIMAL}, discount = #{record.discount,jdbcType=DECIMAL},
discount_member = #{record.discountMember,jdbcType=INTEGER}, discount_member = #{record.discountMember,jdbcType=INTEGER},
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
`status` = #{record.status,jdbcType=SMALLINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -390,15 +392,18 @@ ...@@ -390,15 +392,18 @@
<if test="discountMember != null"> <if test="discountMember != null">
discount_member = #{discountMember,jdbcType=INTEGER}, discount_member = #{discountMember,jdbcType=INTEGER},
</if> </if>
<if test="expireTime != null">
expire_time = #{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
`status` = #{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null"> <if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="expireTime != null">
expire_time = #{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null"> <if test="deleted != null">
deleted = #{deleted,jdbcType=BIT}, deleted = #{deleted,jdbcType=BIT},
</if> </if>
...@@ -416,9 +421,10 @@ ...@@ -416,9 +421,10 @@
pic_url = #{picUrl,jdbcType=VARCHAR}, pic_url = #{picUrl,jdbcType=VARCHAR},
discount = #{discount,jdbcType=DECIMAL}, discount = #{discount,jdbcType=DECIMAL},
discount_member = #{discountMember,jdbcType=INTEGER}, discount_member = #{discountMember,jdbcType=INTEGER},
expire_time = #{expireTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=SMALLINT},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
expire_time = #{expireTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -426,7 +432,6 @@ ...@@ -426,7 +432,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -443,18 +448,16 @@ ...@@ -443,18 +448,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time, <include refid="Base_Column_List" />
expire_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_groupon_rules from litemall_groupon_rules
...@@ -470,7 +473,6 @@ ...@@ -470,7 +473,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_groupon_rules set deleted = 1 update litemall_groupon_rules set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -481,7 +483,6 @@ ...@@ -481,7 +483,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_groupon_rules set deleted = 1 update litemall_groupon_rules set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallIssueMapper.xml
View file @ 324c8da3
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -117,11 +116,11 @@ ...@@ -117,11 +116,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, question, answer, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_issue from litemall_issue
...@@ -143,11 +142,6 @@ ...@@ -143,11 +142,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -170,17 +164,16 @@ ...@@ -170,17 +164,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, question, answer, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_issue from litemall_issue
...@@ -359,7 +352,6 @@ ...@@ -359,7 +352,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -376,17 +368,16 @@ ...@@ -376,17 +368,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, question, answer, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_issue from litemall_issue
...@@ -402,7 +393,6 @@ ...@@ -402,7 +393,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_issue set deleted = 1 update litemall_issue set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -413,7 +403,6 @@ ...@@ -413,7 +403,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_issue set deleted = 1 update litemall_issue set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallKeywordMapper.xml
View file @ 324c8da3
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -120,11 +119,11 @@ ...@@ -120,11 +119,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
...@@ -146,11 +145,6 @@ ...@@ -146,11 +145,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -173,17 +167,16 @@ ...@@ -173,17 +167,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
...@@ -406,7 +399,6 @@ ...@@ -406,7 +399,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -423,17 +415,16 @@ ...@@ -423,17 +415,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted <include refid="Base_Column_List" />
</otherwise> </otherwise>
</choose> </choose>
from litemall_keyword from litemall_keyword
...@@ -449,7 +440,6 @@ ...@@ -449,7 +440,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_keyword set deleted = 1 update litemall_keyword set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -460,7 +450,6 @@ ...@@ -460,7 +450,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_keyword set deleted = 1 update litemall_keyword set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallLogMapper.xml
View file @ 324c8da3
...@@ -114,7 +114,6 @@ ...@@ -114,7 +114,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -123,12 +122,11 @@ ...@@ -123,12 +122,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time, <include refid="Base_Column_List" />
deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_log from litemall_log
...@@ -150,11 +148,6 @@ ...@@ -150,11 +148,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -177,18 +170,16 @@ ...@@ -177,18 +170,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time, <include refid="Base_Column_List" />
deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_log from litemall_log
...@@ -441,7 +432,6 @@ ...@@ -441,7 +432,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -458,18 +448,16 @@ ...@@ -458,18 +448,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time, <include refid="Base_Column_List" />
deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_log from litemall_log
...@@ -485,7 +473,6 @@ ...@@ -485,7 +473,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_log set deleted = 1 update litemall_log set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -496,7 +483,6 @@ ...@@ -496,7 +483,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_log set deleted = 1 update litemall_log set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
View file @ 324c8da3
...@@ -155,7 +155,6 @@ ...@@ -155,7 +155,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<if test="example.distinct"> <if test="example.distinct">
...@@ -164,12 +163,11 @@ ...@@ -164,12 +163,11 @@
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, <include refid="Base_Column_List" />
pic_url, `comment`, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
...@@ -191,11 +189,6 @@ ...@@ -191,11 +189,6 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap"> <select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
...@@ -218,18 +211,16 @@ ...@@ -218,18 +211,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, <include refid="Base_Column_List" />
pic_url, `comment`, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
...@@ -526,7 +517,6 @@ ...@@ -526,7 +517,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
...@@ -543,18 +533,16 @@ ...@@ -543,18 +533,16 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
${column.escapedColumnName} ${column.aliasedEscapedColumnName}
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, <include refid="Base_Column_List" />
pic_url, `comment`, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from litemall_order_goods from litemall_order_goods
...@@ -570,7 +558,6 @@ ...@@ -570,7 +558,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_order_goods set deleted = 1 update litemall_order_goods set deleted = 1
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -581,7 +568,6 @@ ...@@ -581,7 +568,6 @@
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
--> -->
update litemall_order_goods set deleted = 1 update litemall_order_goods set deleted = 1
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
......
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