From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoMapper.xml | 250 +++++++++++++++++++++++++++++--------------------
1 files changed, 149 insertions(+), 101 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoMapper.xml
index 8947a96..5548b64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/brand/BrandInfoMapper.xml
@@ -1,101 +1,149 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.yeshi.fanli.dao.mybatis.brand.BrandInfoMapper">
- <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.brand.BrandInfo">
- <id column="bf_id" property="id" jdbcType="BIGINT"/>
- <result column="bf_name" property="name" jdbcType="VARCHAR"/>
- <result column="bf_icon" property="icon" jdbcType="VARCHAR"/>
- <result column="bf_weight" property="weight" jdbcType="DOUBLE"/>
- <result column="bf_goods_total" property="goodsTotal" jdbcType="INTEGER"/>
- <result column="bf_state" property="state" jdbcType="INTEGER"/>
- <result column="bf_create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="bf_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <association column="bf_cid" property="brandClass" javaType="com.yeshi.fanli.entity.brand.BrandClass">
- <id column="bf_cid" property="id" jdbcType="BIGINT" />
- </association>
- </resultMap>
-
- <resultMap id="ResultVOMap" type="com.yeshi.fanli.vo.brand.BrandInfoVO">
- <id column="bf_id" property="id" jdbcType="BIGINT"/>
- <result column="bf_name" property="name" jdbcType="VARCHAR"/>
- <result column="bf_icon" property="icon" jdbcType="VARCHAR"/>
- <result column="bf_weight" property="weight" jdbcType="DOUBLE"/>
- <result column="bf_goods_total" property="goodsTotal" jdbcType="INTEGER"/>
- <result column="bf_state" property="state" jdbcType="INTEGER"/>
- <result column="bf_create_time" property="createTime" jdbcType="TIMESTAMP"/>
- <result column="bf_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
- <association column="bf_cid" property="brandClass" javaType="com.yeshi.fanli.entity.brand.BrandClass">
- <id column="bf_cid" property="id" jdbcType="BIGINT" />
- </association>
- </resultMap>
-
- <sql id="Base_Column_List">bf_id,bf_cid,bf_name,bf_icon,bf_weight,bf_goods_total,bf_state,bf_create_time,bf_update_time</sql>
- <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
- <include refid="Base_Column_List"/>from yeshi_ec_brand_info where bf_id = #{id,jdbcType=BIGINT}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_brand_info where bf_id = #{id,jdbcType=BIGINT}</delete>
- <insert id="insert" parameterType="com.yeshi.fanli.entity.brand.BrandInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_info (bf_id,bf_cid,bf_name,bf_icon,bf_weight,bf_goods_total,bf_state,bf_create_time,bf_update_time) values (#{id,jdbcType=BIGINT},#{brandClass.id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{weight,jdbcType=DOUBLE},#{goodsTotal,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
- <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.brand.BrandInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_info
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">bf_id,</if>
- <if test="brandClass != null">bf_cid,</if>
- <if test="name != null">bf_name,</if>
- <if test="icon != null">bf_icon,</if>
- <if test="weight != null">bf_weight,</if>
- <if test="goodsTotal != null">bf_goods_total,</if>
- <if test="state != null">bf_state,</if>
- <if test="createTime != null">bf_create_time,</if>
- <if test="updateTime != null">bf_update_time,</if>
- </trim>values
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="brandClass != null">#{brandClass.id,jdbcType=BIGINT},</if>
- <if test="name != null">#{name,jdbcType=VARCHAR},</if>
- <if test="icon != null">#{icon,jdbcType=VARCHAR},</if>
- <if test="weight != null">#{weight,jdbcType=DOUBLE},</if>
- <if test="goodsTotal != null">#{goodsTotal,jdbcType=INTEGER},</if>
- <if test="state != null">#{state,jdbcType=INTEGER},</if>
- <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
- <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.brand.BrandInfo">update yeshi_ec_brand_info set bf_cid = #{brandClass.id,jdbcType=BIGINT},bf_name = #{name,jdbcType=VARCHAR},bf_icon = #{icon,jdbcType=VARCHAR},bf_weight = #{weight,jdbcType=DOUBLE},bf_goods_total = #{goodsTotal,jdbcType=INTEGER},bf_state = #{state,jdbcType=INTEGER},bf_create_time = #{createTime,jdbcType=TIMESTAMP},bf_update_time = #{updateTime,jdbcType=TIMESTAMP} where bf_id = #{id,jdbcType=BIGINT}</update>
- <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.brand.BrandInfo">update yeshi_ec_brand_info
- <set>
- <if test="brandClass != null">bf_cid=#{brandClass.id,jdbcType=BIGINT},</if>
- <if test="name != null">bf_name=#{name,jdbcType=VARCHAR},</if>
- <if test="icon != null">bf_icon=#{icon,jdbcType=VARCHAR},</if>
- <if test="weight != null">bf_weight=#{weight,jdbcType=DOUBLE},</if>
- <if test="goodsTotal != null">bf_goods_total=#{goodsTotal,jdbcType=INTEGER},</if>
- <if test="state != null">bf_state=#{state,jdbcType=INTEGER},</if>
- <if test="createTime != null">bf_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
- <if test="updateTime != null">bf_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
- </set> where bf_id = #{id,jdbcType=BIGINT}
- </update>
-
- <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">
- delete from yeshi_ec_brand_info WHERE bf_id in
- <foreach collection="list" item="item" open="(" close=")"
- separator=",">#{item}</foreach>
- </delete>
-
- <select id="listBrandInfoVO" resultMap="ResultVOMap">
- SELECT * FROM yeshi_ec_brand_info d
- WHERE d.`bf_state` = 1 <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
- ORDER BY d.`bf_weight` DESC
- LIMIT ${start},${count}
- </select>
-
- <select id="countBrandInfo" resultType="Long">
- SELECT IFNULL(COUNT(d.`bf_id`),0) FROM yeshi_ec_brand_info d
- WHERE d.`bf_state` = 1 <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
- </select>
-
- <select id="listValidAll" resultMap="BaseResultMap">
- SELECT * FROM yeshi_ec_brand_info d
- WHERE d.`bf_state` = 1
- LIMIT ${start},${count}
- </select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yeshi.fanli.dao.mybatis.brand.BrandInfoMapper">
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.brand.BrandInfo">
+ <id column="bf_id" property="id" jdbcType="BIGINT"/>
+ <result column="bf_name" property="name" jdbcType="VARCHAR"/>
+ <result column="bf_icon" property="icon" jdbcType="VARCHAR"/>
+ <result column="bf_weight" property="weight" jdbcType="DOUBLE"/>
+ <result column="bf_goods_total" property="goodsTotal" jdbcType="INTEGER"/>
+ <result column="bf_state" property="state" jdbcType="INTEGER"/>
+ <result column="bf_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="bf_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ <association column="bf_cid" property="brandClass" javaType="com.yeshi.fanli.entity.brand.BrandClass">
+ <id column="bf_cid" property="id" jdbcType="BIGINT" />
+ </association>
+ </resultMap>
+
+ <resultMap id="ResultVOMap" type="com.yeshi.fanli.vo.brand.BrandInfoVO">
+ <id column="bf_id" property="id" jdbcType="BIGINT"/>
+ <result column="bf_name" property="name" jdbcType="VARCHAR"/>
+ <result column="bf_icon" property="icon" jdbcType="VARCHAR"/>
+ <result column="bf_weight" property="weight" jdbcType="DOUBLE"/>
+ <result column="bf_goods_total" property="goodsTotal" jdbcType="INTEGER"/>
+ <result column="bf_state" property="state" jdbcType="INTEGER"/>
+ <result column="bf_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+ <result column="bf_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+ <association column="bf_cid" property="brandClass" javaType="com.yeshi.fanli.entity.brand.BrandClass">
+ <id column="bf_cid" property="id" jdbcType="BIGINT" />
+ </association>
+ </resultMap>
+
+ <sql id="Base_Column_List">bf_id,bf_cid,bf_name,bf_icon,bf_weight,bf_goods_total,bf_state,bf_create_time,bf_update_time</sql>
+ <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+ <include refid="Base_Column_List"/>from yeshi_ec_brand_info where bf_id = #{id,jdbcType=BIGINT}
+ </select>
+ <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_brand_info where bf_id = #{id,jdbcType=BIGINT}</delete>
+ <insert id="insert" parameterType="com.yeshi.fanli.entity.brand.BrandInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_info (bf_id,bf_cid,bf_name,bf_icon,bf_weight,bf_goods_total,bf_state,bf_create_time,bf_update_time) values (#{id,jdbcType=BIGINT},#{brandClass.id,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{icon,jdbcType=VARCHAR},#{weight,jdbcType=DOUBLE},#{goodsTotal,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+ <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.brand.BrandInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_brand_info
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">bf_id,</if>
+ <if test="brandClass != null">bf_cid,</if>
+ <if test="name != null">bf_name,</if>
+ <if test="icon != null">bf_icon,</if>
+ <if test="weight != null">bf_weight,</if>
+ <if test="goodsTotal != null">bf_goods_total,</if>
+ <if test="state != null">bf_state,</if>
+ <if test="createTime != null">bf_create_time,</if>
+ <if test="updateTime != null">bf_update_time,</if>
+ </trim>values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id,jdbcType=BIGINT},</if>
+ <if test="brandClass != null">#{brandClass.id,jdbcType=BIGINT},</if>
+ <if test="name != null">#{name,jdbcType=VARCHAR},</if>
+ <if test="icon != null">#{icon,jdbcType=VARCHAR},</if>
+ <if test="weight != null">#{weight,jdbcType=DOUBLE},</if>
+ <if test="goodsTotal != null">#{goodsTotal,jdbcType=INTEGER},</if>
+ <if test="state != null">#{state,jdbcType=INTEGER},</if>
+ <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+ </trim>
+ </insert>
+ <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.brand.BrandInfo">update yeshi_ec_brand_info set bf_cid = #{brandClass.id,jdbcType=BIGINT},bf_name = #{name,jdbcType=VARCHAR},bf_icon = #{icon,jdbcType=VARCHAR},bf_weight = #{weight,jdbcType=DOUBLE},bf_goods_total = #{goodsTotal,jdbcType=INTEGER},bf_state = #{state,jdbcType=INTEGER},bf_create_time = #{createTime,jdbcType=TIMESTAMP},bf_update_time = #{updateTime,jdbcType=TIMESTAMP} where bf_id = #{id,jdbcType=BIGINT}</update>
+ <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.brand.BrandInfo">update yeshi_ec_brand_info
+ <set>
+ <if test="brandClass != null">bf_cid=#{brandClass.id,jdbcType=BIGINT},</if>
+ <if test="name != null">bf_name=#{name,jdbcType=VARCHAR},</if>
+ <if test="icon != null">bf_icon=#{icon,jdbcType=VARCHAR},</if>
+ <if test="weight != null">bf_weight=#{weight,jdbcType=DOUBLE},</if>
+ <if test="goodsTotal != null">bf_goods_total=#{goodsTotal,jdbcType=INTEGER},</if>
+ <if test="state != null">bf_state=#{state,jdbcType=INTEGER},</if>
+ <if test="createTime != null">bf_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+ <if test="updateTime != null">bf_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+ </set> where bf_id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <delete id="deleteBatchByPrimaryKey" parameterType="java.util.List">
+ delete from yeshi_ec_brand_info WHERE bf_id in
+ <foreach collection="list" item="item" open="(" close=")"
+ separator=",">#{item}</foreach>
+ </delete>
+
+ <select id="listBrandInfoVO" resultMap="ResultVOMap">
+ SELECT * FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1 AND d.bf_goods_total <![CDATA[>=]]> 3
+ <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
+ ORDER BY d.`bf_weight` DESC,d.bf_id
+ LIMIT ${start},${count}
+ </select>
+
+ <select id="countBrandInfo" resultType="Long">
+ SELECT IFNULL(COUNT(d.`bf_id`),0) FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1 AND d.bf_goods_total <![CDATA[>=]]> 3
+ <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
+ </select>
+
+ <select id="listValidByCidToApp" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1 AND d.`bf_cid` = #{cid} AND d.bf_goods_total <![CDATA[>=]]> 3
+ </select>
+
+ <select id="countValidByCid" resultType="Long">
+ SELECT IFNULL(COUNT(d.`bf_id`),0) FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1 <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
+ </select>
+
+ <select id="countValidByCidToApp" resultType="Long">
+ SELECT IFNULL(COUNT(d.`bf_id`),0) FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1 <if test="cid != null">AND d.`bf_cid` = #{cid} </if>
+ AND d.bf_goods_total <![CDATA[>=]]> 3
+ </select>
+
+ <select id="listValidAll" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_brand_info d
+ WHERE d.`bf_state` = 1
+ LIMIT ${start},${count}
+ </select>
+
+
+ <select id="listQuery" resultMap="BaseResultMap">
+ SELECT * FROM yeshi_ec_brand_info
+ WHERE 1=1
+ <if test="key != null and key !='' ">
+ AND bf_name LIKE '%${key}%'
+ </if>
+ <if test="state != null">
+ AND bf_state = #{state}
+ </if>
+ <if test="cid != null">
+ AND bf_cid = #{cid}
+ </if>
+ ORDER BY bf_weight DESC
+ LIMIT ${start},${count}
+ </select>
+
+ <select id="countQuery" resultType="java.lang.Long">
+ SELECT IFNULL(COUNT(bf_id),0) FROM yeshi_ec_brand_info
+ WHERE 1=1
+ <if test="key != null and key !='' ">
+ AND bf_name LIKE '%${key}%'
+ </if>
+ <if test="state != null">
+ AND bf_state = #{state}
+ </if>
+ <if test="cid != null">
+ AND bf_cid = #{cid}
+ </if>
+ </select>
+</mapper>
--
Gitblit v1.8.0