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
Show 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 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -123,12 +122,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon_user
......@@ -150,11 +148,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -177,18 +170,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon_user
......@@ -441,7 +432,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -458,18 +448,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, coupon_id, `status`, used_time, start_time, end_time, order_id, add_time,
update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_coupon_user
......@@ -485,7 +473,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -496,7 +483,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFeedbackMapper.xml
View file @ 324c8da3
......@@ -153,7 +153,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -162,12 +161,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_feedback
......@@ -189,11 +187,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -216,18 +209,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_feedback
......@@ -496,7 +487,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -513,18 +503,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, username, mobile, feed_type, content, `status`, has_picture, pic_urls,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_feedback
......@@ -540,7 +528,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -551,7 +538,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallFootprintMapper.xml
View file @ 324c8da3
......@@ -108,7 +108,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -117,11 +116,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_footprint
......@@ -143,11 +142,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -170,17 +164,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_footprint
......@@ -359,7 +352,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -376,17 +368,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, goods_id, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_footprint
......@@ -402,7 +393,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -413,7 +403,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml
View file @ 324c8da3
......@@ -109,7 +109,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -118,11 +117,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_attribute
......@@ -144,11 +143,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -171,17 +165,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_attribute
......@@ -376,7 +369,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -393,17 +385,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, `attribute`, `value`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_attribute
......@@ -419,7 +410,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -430,7 +420,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsMapper.xml
View file @ 324c8da3
......@@ -196,7 +196,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -205,13 +204,13 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale,
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price,
add_time, update_time, deleted, detail
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
</otherwise>
</choose>
from litemall_goods
......@@ -235,11 +234,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<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
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -264,19 +258,18 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale,
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price,
add_time, update_time, deleted, detail
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
</otherwise>
</choose>
from litemall_goods
......@@ -732,7 +725,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -749,7 +741,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -768,19 +759,18 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_sn, `name`, category_id, brand_id, gallery, keywords, brief, is_on_sale,
sort_order, pic_url, share_url, is_new, is_hot, unit, counter_price, retail_price,
add_time, update_time, deleted, detail
<include refid="Base_Column_List" />
,
<include refid="Blob_Column_List" />
</otherwise>
</choose>
from litemall_goods
......@@ -796,7 +786,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -807,7 +796,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsProductMapper.xml
View file @ 324c8da3
......@@ -149,7 +149,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -158,12 +157,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_product
......@@ -185,11 +183,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -212,18 +205,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_product
......@@ -448,7 +439,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -465,18 +455,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specifications, price, `number`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_product
......@@ -492,7 +480,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -503,7 +490,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsSpecificationMapper.xml
View file @ 324c8da3
......@@ -110,7 +110,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -119,11 +118,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_specification
......@@ -145,11 +144,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -172,17 +166,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_specification
......@@ -391,7 +384,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -408,17 +400,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, specification, `value`, pic_url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_goods_specification
......@@ -434,7 +425,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -445,7 +435,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGrouponMapper.xml
View file @ 324c8da3
......@@ -11,11 +11,12 @@
<result column="groupon_id" jdbcType="INTEGER" property="grouponId" />
<result column="rules_id" jdbcType="INTEGER" property="rulesId" />
<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_time" jdbcType="TIMESTAMP" property="creatorUserTime" />
<result column="status" jdbcType="SMALLINT" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<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" />
</resultMap>
<sql id="Example_Where_Clause">
......@@ -89,8 +90,8 @@
WARNING - @mbg.generated
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,
share_url, payed, deleted
id, order_id, groupon_id, rules_id, user_id, share_url, creator_user_id, creator_user_time,
`status`, add_time, update_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponExample" resultMap="BaseResultMap">
<!--
......@@ -114,7 +115,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -123,12 +123,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time,
share_url, payed, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon
......@@ -150,11 +149,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -177,18 +171,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time,
share_url, payed, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon
......@@ -221,13 +213,13 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_groupon (order_id, groupon_id, rules_id,
user_id, creator_user_id, add_time,
update_time, share_url, payed,
deleted)
user_id, share_url, creator_user_id,
creator_user_time, `status`, add_time,
update_time, deleted)
values (#{orderId,jdbcType=INTEGER}, #{grouponId,jdbcType=INTEGER}, #{rulesId,jdbcType=INTEGER},
#{userId,jdbcType=INTEGER}, #{creatorUserId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{shareUrl,jdbcType=VARCHAR}, #{payed,jdbcType=BIT},
#{deleted,jdbcType=BIT})
#{userId,jdbcType=INTEGER}, #{shareUrl,jdbcType=VARCHAR}, #{creatorUserId,jdbcType=INTEGER},
#{creatorUserTime,jdbcType=TIMESTAMP}, #{status,jdbcType=SMALLINT}, #{addTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGroupon">
<!--
......@@ -251,21 +243,24 @@
<if test="userId != null">
user_id,
</if>
<if test="shareUrl != null">
share_url,
</if>
<if test="creatorUserId != null">
creator_user_id,
</if>
<if test="creatorUserTime != null">
creator_user_time,
</if>
<if test="status != null">
`status`,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="shareUrl != null">
share_url,
</if>
<if test="payed != null">
payed,
</if>
<if test="deleted != null">
deleted,
</if>
......@@ -283,21 +278,24 @@
<if test="userId != null">
#{userId,jdbcType=INTEGER},
</if>
<if test="shareUrl != null">
#{shareUrl,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null">
#{creatorUserId,jdbcType=INTEGER},
</if>
<if test="creatorUserTime != null">
#{creatorUserTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shareUrl != null">
#{shareUrl,jdbcType=VARCHAR},
</if>
<if test="payed != null">
#{payed,jdbcType=BIT},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
......@@ -335,21 +333,24 @@
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=INTEGER},
</if>
<if test="record.shareUrl != null">
share_url = #{record.shareUrl,jdbcType=VARCHAR},
</if>
<if test="record.creatorUserId != null">
creator_user_id = #{record.creatorUserId,jdbcType=INTEGER},
</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">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</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">
deleted = #{record.deleted,jdbcType=BIT},
</if>
......@@ -369,11 +370,12 @@
groupon_id = #{record.grouponId,jdbcType=INTEGER},
rules_id = #{record.rulesId,jdbcType=INTEGER},
user_id = #{record.userId,jdbcType=INTEGER},
share_url = #{record.shareUrl,jdbcType=VARCHAR},
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},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
share_url = #{record.shareUrl,jdbcType=VARCHAR},
payed = #{record.payed,jdbcType=BIT},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -398,21 +400,24 @@
<if test="userId != null">
user_id = #{userId,jdbcType=INTEGER},
</if>
<if test="shareUrl != null">
share_url = #{shareUrl,jdbcType=VARCHAR},
</if>
<if test="creatorUserId != null">
creator_user_id = #{creatorUserId,jdbcType=INTEGER},
</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">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shareUrl != null">
share_url = #{shareUrl,jdbcType=VARCHAR},
</if>
<if test="payed != null">
payed = #{payed,jdbcType=BIT},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
......@@ -429,11 +434,12 @@
groupon_id = #{grouponId,jdbcType=INTEGER},
rules_id = #{rulesId,jdbcType=INTEGER},
user_id = #{userId,jdbcType=INTEGER},
share_url = #{shareUrl,jdbcType=VARCHAR},
creator_user_id = #{creatorUserId,jdbcType=INTEGER},
creator_user_time = #{creatorUserTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=SMALLINT},
add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
share_url = #{shareUrl,jdbcType=VARCHAR},
payed = #{payed,jdbcType=BIT},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -441,7 +447,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -458,18 +463,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, groupon_id, rules_id, user_id, creator_user_id, add_time, update_time,
share_url, payed, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon
......@@ -485,7 +488,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -496,7 +498,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGrouponRulesMapper.xml
View file @ 324c8da3
......@@ -12,9 +12,10 @@
<result column="pic_url" jdbcType="VARCHAR" property="picUrl" />
<result column="discount" jdbcType="DECIMAL" property="discount" />
<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="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="expire_time" jdbcType="TIMESTAMP" property="expireTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Example_Where_Clause">
......@@ -88,8 +89,8 @@
WARNING - @mbg.generated
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,
expire_time, deleted
id, goods_id, goods_name, pic_url, discount, discount_member, expire_time, `status`,
add_time, update_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRulesExample" resultMap="BaseResultMap">
<!--
......@@ -113,7 +114,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -122,12 +122,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time,
expire_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon_rules
......@@ -149,11 +148,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -176,18 +170,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time,
expire_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon_rules
......@@ -220,13 +212,13 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into litemall_groupon_rules (goods_id, goods_name, pic_url,
discount, discount_member, add_time,
update_time, expire_time, deleted
)
discount, discount_member, expire_time,
`status`, add_time, update_time,
deleted)
values (#{goodsId,jdbcType=INTEGER}, #{goodsName,jdbcType=VARCHAR}, #{picUrl,jdbcType=VARCHAR},
#{discount,jdbcType=DECIMAL}, #{discountMember,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{expireTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}
)
#{discount,jdbcType=DECIMAL}, #{discountMember,jdbcType=INTEGER}, #{expireTime,jdbcType=TIMESTAMP},
#{status,jdbcType=SMALLINT}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallGrouponRules">
<!--
......@@ -253,15 +245,18 @@
<if test="discountMember != null">
discount_member,
</if>
<if test="expireTime != null">
expire_time,
</if>
<if test="status != null">
`status`,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="expireTime != null">
expire_time,
</if>
<if test="deleted != null">
deleted,
</if>
......@@ -282,15 +277,18 @@
<if test="discountMember != null">
#{discountMember,jdbcType=INTEGER},
</if>
<if test="expireTime != null">
#{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="expireTime != null">
#{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
#{deleted,jdbcType=BIT},
</if>
......@@ -331,15 +329,18 @@
<if test="record.discountMember != null">
discount_member = #{record.discountMember,jdbcType=INTEGER},
</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">
add_time = #{record.addTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.expireTime != null">
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
</if>
<if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT},
</if>
......@@ -360,9 +361,10 @@
pic_url = #{record.picUrl,jdbcType=VARCHAR},
discount = #{record.discount,jdbcType=DECIMAL},
discount_member = #{record.discountMember,jdbcType=INTEGER},
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
`status` = #{record.status,jdbcType=SMALLINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
expire_time = #{record.expireTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -390,15 +392,18 @@
<if test="discountMember != null">
discount_member = #{discountMember,jdbcType=INTEGER},
</if>
<if test="expireTime != null">
expire_time = #{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
`status` = #{status,jdbcType=SMALLINT},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="expireTime != null">
expire_time = #{expireTime,jdbcType=TIMESTAMP},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=BIT},
</if>
......@@ -416,9 +421,10 @@
pic_url = #{picUrl,jdbcType=VARCHAR},
discount = #{discount,jdbcType=DECIMAL},
discount_member = #{discountMember,jdbcType=INTEGER},
expire_time = #{expireTime,jdbcType=TIMESTAMP},
`status` = #{status,jdbcType=SMALLINT},
add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
expire_time = #{expireTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -426,7 +432,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -443,18 +448,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, goods_id, goods_name, pic_url, discount, discount_member, add_time, update_time,
expire_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_groupon_rules
......@@ -470,7 +473,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -481,7 +483,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallIssueMapper.xml
View file @ 324c8da3
......@@ -108,7 +108,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -117,11 +116,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, question, answer, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_issue
......@@ -143,11 +142,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -170,17 +164,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, question, answer, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_issue
......@@ -359,7 +352,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -376,17 +368,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, question, answer, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_issue
......@@ -402,7 +393,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -413,7 +403,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallKeywordMapper.xml
View file @ 324c8da3
......@@ -111,7 +111,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -120,11 +119,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_keyword
......@@ -146,11 +145,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -173,17 +167,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_keyword
......@@ -406,7 +399,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -423,17 +415,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, keyword, url, is_hot, is_default, sort_order, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_keyword
......@@ -449,7 +440,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -460,7 +450,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallLogMapper.xml
View file @ 324c8da3
......@@ -114,7 +114,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -123,12 +122,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_log
......@@ -150,11 +148,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -177,18 +170,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_log
......@@ -441,7 +432,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -458,18 +448,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `admin`, ip, `type`, `action`, `status`, `result`, `comment`, add_time, update_time,
deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_log
......@@ -485,7 +473,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -496,7 +483,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderGoodsMapper.xml
View file @ 324c8da3
......@@ -155,7 +155,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -164,12 +163,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, `comment`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order_goods
......@@ -191,11 +189,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -218,18 +211,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, `comment`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order_goods
......@@ -526,7 +517,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -543,18 +533,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications,
pic_url, `comment`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order_goods
......@@ -570,7 +558,6 @@
<!--
WARNING - @mbg.generated
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
<if test="_parameter != null">
......@@ -581,7 +568,6 @@
<!--
WARNING - @mbg.generated
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
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml
View file @ 324c8da3
......@@ -26,6 +26,10 @@
<result column="ship_sn" jdbcType="VARCHAR" property="shipSn" />
<result column="ship_channel" jdbcType="VARCHAR" property="shipChannel" />
<result column="ship_time" jdbcType="TIMESTAMP" property="shipTime" />
<result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
<result column="refund_type" jdbcType="VARCHAR" property="refundType" />
<result column="refund_content" jdbcType="VARCHAR" property="refundContent" />
<result column="refund_time" jdbcType="TIMESTAMP" property="refundTime" />
<result column="confirm_time" jdbcType="TIMESTAMP" property="confirmTime" />
<result column="comments" jdbcType="SMALLINT" property="comments" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
......@@ -106,8 +110,8 @@
-->
id, user_id, order_sn, order_status, consignee, mobile, address, message, goods_price,
freight_price, coupon_price, integral_price, groupon_price, order_price, actual_price,
pay_id, pay_time, ship_sn, ship_channel, ship_time, confirm_time, comments, end_time,
add_time, update_time, deleted
pay_id, pay_time, ship_sn, ship_channel, ship_time, refund_amount, refund_type, refund_content,
refund_time, confirm_time, comments, end_time, add_time, update_time, deleted
</sql>
<select id="selectByExample" parameterType="org.linlinjava.litemall.db.domain.LitemallOrderExample" resultMap="BaseResultMap">
<!--
......@@ -131,7 +135,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -140,14 +143,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, message, goods_price,
freight_price, coupon_price, integral_price, groupon_price, order_price, actual_price,
pay_id, pay_time, ship_sn, ship_channel, ship_time, confirm_time, comments, end_time,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order
......@@ -169,11 +169,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -196,20 +191,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, message, goods_price,
freight_price, coupon_price, integral_price, groupon_price, order_price, actual_price,
pay_id, pay_time, ship_sn, ship_channel, ship_time, confirm_time, comments, end_time,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order
......@@ -247,18 +238,20 @@
coupon_price, integral_price, groupon_price,
order_price, actual_price, pay_id,
pay_time, ship_sn, ship_channel,
ship_time, confirm_time, comments,
end_time, add_time, update_time,
deleted)
ship_time, refund_amount, refund_type,
refund_content, refund_time, confirm_time,
comments, end_time, add_time,
update_time, deleted)
values (#{userId,jdbcType=INTEGER}, #{orderSn,jdbcType=VARCHAR}, #{orderStatus,jdbcType=SMALLINT},
#{consignee,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{message,jdbcType=VARCHAR}, #{goodsPrice,jdbcType=DECIMAL}, #{freightPrice,jdbcType=DECIMAL},
#{couponPrice,jdbcType=DECIMAL}, #{integralPrice,jdbcType=DECIMAL}, #{grouponPrice,jdbcType=DECIMAL},
#{orderPrice,jdbcType=DECIMAL}, #{actualPrice,jdbcType=DECIMAL}, #{payId,jdbcType=VARCHAR},
#{payTime,jdbcType=TIMESTAMP}, #{shipSn,jdbcType=VARCHAR}, #{shipChannel,jdbcType=VARCHAR},
#{shipTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP}, #{comments,jdbcType=SMALLINT},
#{endTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{deleted,jdbcType=BIT})
#{shipTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, #{refundType,jdbcType=VARCHAR},
#{refundContent,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, #{confirmTime,jdbcType=TIMESTAMP},
#{comments,jdbcType=SMALLINT}, #{endTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="org.linlinjava.litemall.db.domain.LitemallOrder">
<!--
......@@ -327,6 +320,18 @@
<if test="shipTime != null">
ship_time,
</if>
<if test="refundAmount != null">
refund_amount,
</if>
<if test="refundType != null">
refund_type,
</if>
<if test="refundContent != null">
refund_content,
</if>
<if test="refundTime != null">
refund_time,
</if>
<if test="confirmTime != null">
confirm_time,
</if>
......@@ -404,6 +409,18 @@
<if test="shipTime != null">
#{shipTime,jdbcType=TIMESTAMP},
</if>
<if test="refundAmount != null">
#{refundAmount,jdbcType=DECIMAL},
</if>
<if test="refundType != null">
#{refundType,jdbcType=VARCHAR},
</if>
<if test="refundContent != null">
#{refundContent,jdbcType=VARCHAR},
</if>
<if test="refundTime != null">
#{refundTime,jdbcType=TIMESTAMP},
</if>
<if test="confirmTime != null">
#{confirmTime,jdbcType=TIMESTAMP},
</if>
......@@ -501,6 +518,18 @@
<if test="record.shipTime != null">
ship_time = #{record.shipTime,jdbcType=TIMESTAMP},
</if>
<if test="record.refundAmount != null">
refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
</if>
<if test="record.refundType != null">
refund_type = #{record.refundType,jdbcType=VARCHAR},
</if>
<if test="record.refundContent != null">
refund_content = #{record.refundContent,jdbcType=VARCHAR},
</if>
<if test="record.refundTime != null">
refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
</if>
<if test="record.confirmTime != null">
confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
</if>
......@@ -550,6 +579,10 @@
ship_sn = #{record.shipSn,jdbcType=VARCHAR},
ship_channel = #{record.shipChannel,jdbcType=VARCHAR},
ship_time = #{record.shipTime,jdbcType=TIMESTAMP},
refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_content = #{record.refundContent,jdbcType=VARCHAR},
refund_time = #{record.refundTime,jdbcType=TIMESTAMP},
confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
comments = #{record.comments,jdbcType=SMALLINT},
end_time = #{record.endTime,jdbcType=TIMESTAMP},
......@@ -624,6 +657,18 @@
<if test="shipTime != null">
ship_time = #{shipTime,jdbcType=TIMESTAMP},
</if>
<if test="refundAmount != null">
refund_amount = #{refundAmount,jdbcType=DECIMAL},
</if>
<if test="refundType != null">
refund_type = #{refundType,jdbcType=VARCHAR},
</if>
<if test="refundContent != null">
refund_content = #{refundContent,jdbcType=VARCHAR},
</if>
<if test="refundTime != null">
refund_time = #{refundTime,jdbcType=TIMESTAMP},
</if>
<if test="confirmTime != null">
confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
</if>
......@@ -670,6 +715,10 @@
ship_sn = #{shipSn,jdbcType=VARCHAR},
ship_channel = #{shipChannel,jdbcType=VARCHAR},
ship_time = #{shipTime,jdbcType=TIMESTAMP},
refund_amount = #{refundAmount,jdbcType=DECIMAL},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_content = #{refundContent,jdbcType=VARCHAR},
refund_time = #{refundTime,jdbcType=TIMESTAMP},
confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
comments = #{comments,jdbcType=SMALLINT},
end_time = #{endTime,jdbcType=TIMESTAMP},
......@@ -682,7 +731,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -699,20 +747,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, order_sn, order_status, consignee, mobile, address, message, goods_price,
freight_price, coupon_price, integral_price, groupon_price, order_price, actual_price,
pay_id, pay_time, ship_sn, ship_channel, ship_time, confirm_time, comments, end_time,
add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_order
......@@ -728,7 +772,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_order set deleted = 1
<if test="_parameter != null">
......@@ -739,7 +782,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_order set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallPermissionMapper.xml
View file @ 324c8da3
......@@ -108,7 +108,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -117,11 +116,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, role_id, permission, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_permission
......@@ -143,11 +142,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -170,17 +164,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, role_id, permission, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_permission
......@@ -359,7 +352,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -376,17 +368,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, role_id, permission, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_permission
......@@ -402,7 +393,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_permission set deleted = 1
<if test="_parameter != null">
......@@ -413,7 +403,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_permission set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRegionMapper.xml
View file @ 324c8da3
......@@ -107,7 +107,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -116,11 +115,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, pid, `name`, `type`, code
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_region
......@@ -145,17 +144,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, pid, `name`, `type`, code
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_region
......@@ -320,7 +318,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -337,17 +334,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, pid, `name`, `type`, code
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_region
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallRoleMapper.xml
View file @ 324c8da3
......@@ -109,7 +109,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -118,11 +117,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, enabled, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_role
......@@ -144,11 +143,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -171,17 +165,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, enabled, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_role
......@@ -376,7 +369,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -393,17 +385,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `name`, `desc`, enabled, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_role
......@@ -419,7 +410,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_role set deleted = 1
<if test="_parameter != null">
......@@ -430,7 +420,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_role set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallSearchHistoryMapper.xml
View file @ 324c8da3
......@@ -109,7 +109,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -118,11 +117,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, keyword, `from`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_search_history
......@@ -144,11 +143,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -171,17 +165,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, keyword, `from`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_search_history
......@@ -376,7 +369,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -393,17 +385,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, user_id, keyword, `from`, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_search_history
......@@ -419,7 +410,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_search_history set deleted = 1
<if test="_parameter != null">
......@@ -430,7 +420,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_search_history set deleted = 1
where id = #{id,jdbcType=INTEGER}
......
litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallStorageMapper.xml
View file @ 324c8da3
......@@ -111,7 +111,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<if test="example.distinct">
......@@ -120,11 +119,11 @@
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_storage
......@@ -146,11 +145,6 @@
where id = #{id,jdbcType=INTEGER}
</select>
<select id="selectByPrimaryKeyWithLogicalDelete" parameterType="map" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -173,17 +167,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_storage
......@@ -406,7 +399,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<include refid="Base_Column_List" />
......@@ -423,17 +415,16 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
select
<choose>
<when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
${column.aliasedEscapedColumnName}
</foreach>
</when>
<otherwise>
id, `key`, `name`, `type`, `size`, url, add_time, update_time, deleted
<include refid="Base_Column_List" />
</otherwise>
</choose>
from litemall_storage
......@@ -449,7 +440,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_storage set deleted = 1
<if test="_parameter != null">
......@@ -460,7 +450,6 @@
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin
-->
update litemall_storage set deleted = 1
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