diff --git a/service/src/main/java/com/hfkj/dao/GoodsMsgMapper.java b/service/src/main/java/com/hfkj/dao/GoodsMsgMapper.java index 68a0f46..4b64a61 100644 --- a/service/src/main/java/com/hfkj/dao/GoodsMsgMapper.java +++ b/service/src/main/java/com/hfkj/dao/GoodsMsgMapper.java @@ -43,26 +43,26 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt { "goods_type_name, goods_type_parent, ", "goods_type_parent_name, sale_num, ", "`type`, child_type, ", - "goods_brand_name, goods_brand, ", - "goods_label, goods_explain, ", - "title, list_img, ", - "banner_img, detail_img, ", - "`status`, create_time, ", - "update_time, mer_id, ", - "mer_name, ext_1, ext_2, ", - "ext_3)", + "show_type, goods_brand_name, ", + "goods_brand, goods_label, ", + "goods_explain, title, ", + "list_img, banner_img, ", + "detail_img, `status`, ", + "create_time, update_time, ", + "mer_id, mer_name, ext_1, ", + "ext_2, ext_3)", "values (#{goodsType,jdbcType=BIGINT}, #{thirdId,jdbcType=VARCHAR}, ", "#{goodsTypeName,jdbcType=VARCHAR}, #{goodsTypeParent,jdbcType=BIGINT}, ", "#{goodsTypeParentName,jdbcType=VARCHAR}, #{saleNum,jdbcType=INTEGER}, ", "#{type,jdbcType=INTEGER}, #{childType,jdbcType=INTEGER}, ", - "#{goodsBrandName,jdbcType=VARCHAR}, #{goodsBrand,jdbcType=BIGINT}, ", - "#{goodsLabel,jdbcType=VARCHAR}, #{goodsExplain,jdbcType=VARCHAR}, ", - "#{title,jdbcType=VARCHAR}, #{listImg,jdbcType=VARCHAR}, ", - "#{bannerImg,jdbcType=VARCHAR}, #{detailImg,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{merId,jdbcType=BIGINT}, ", - "#{merName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{showType,jdbcType=INTEGER}, #{goodsBrandName,jdbcType=VARCHAR}, ", + "#{goodsBrand,jdbcType=BIGINT}, #{goodsLabel,jdbcType=VARCHAR}, ", + "#{goodsExplain,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, ", + "#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ", + "#{detailImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{merId,jdbcType=BIGINT}, #{merName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(GoodsMsg record); @@ -82,6 +82,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt { @Result(column="sale_num", property="saleNum", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="child_type", property="childType", jdbcType=JdbcType.INTEGER), + @Result(column="show_type", property="showType", jdbcType=JdbcType.INTEGER), @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_brand", property="goodsBrand", jdbcType=JdbcType.BIGINT), @Result(column="goods_label", property="goodsLabel", jdbcType=JdbcType.VARCHAR), @@ -104,9 +105,9 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt { @Select({ "select", "id, goods_type, third_id, goods_type_name, goods_type_parent, goods_type_parent_name, ", - "sale_num, `type`, child_type, goods_brand_name, goods_brand, goods_label, goods_explain, ", - "title, list_img, banner_img, detail_img, `status`, create_time, update_time, ", - "mer_id, mer_name, ext_1, ext_2, ext_3", + "sale_num, `type`, child_type, show_type, goods_brand_name, goods_brand, goods_label, ", + "goods_explain, title, list_img, banner_img, detail_img, `status`, create_time, ", + "update_time, mer_id, mer_name, ext_1, ext_2, ext_3", "from goods_msg", "where id = #{id,jdbcType=BIGINT}" }) @@ -120,6 +121,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt { @Result(column="sale_num", property="saleNum", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="child_type", property="childType", jdbcType=JdbcType.INTEGER), + @Result(column="show_type", property="showType", jdbcType=JdbcType.INTEGER), @Result(column="goods_brand_name", property="goodsBrandName", jdbcType=JdbcType.VARCHAR), @Result(column="goods_brand", property="goodsBrand", jdbcType=JdbcType.BIGINT), @Result(column="goods_label", property="goodsLabel", jdbcType=JdbcType.VARCHAR), @@ -158,6 +160,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt { "sale_num = #{saleNum,jdbcType=INTEGER},", "`type` = #{type,jdbcType=INTEGER},", "child_type = #{childType,jdbcType=INTEGER},", + "show_type = #{showType,jdbcType=INTEGER},", "goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR},", "goods_brand = #{goodsBrand,jdbcType=BIGINT},", "goods_label = #{goodsLabel,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/GoodsMsgSqlProvider.java b/service/src/main/java/com/hfkj/dao/GoodsMsgSqlProvider.java index 67310d2..6f682c6 100644 --- a/service/src/main/java/com/hfkj/dao/GoodsMsgSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/GoodsMsgSqlProvider.java @@ -60,6 +60,10 @@ public class GoodsMsgSqlProvider { sql.VALUES("child_type", "#{childType,jdbcType=INTEGER}"); } + if (record.getShowType() != null) { + sql.VALUES("show_type", "#{showType,jdbcType=INTEGER}"); + } + if (record.getGoodsBrandName() != null) { sql.VALUES("goods_brand_name", "#{goodsBrandName,jdbcType=VARCHAR}"); } @@ -142,6 +146,7 @@ public class GoodsMsgSqlProvider { sql.SELECT("sale_num"); sql.SELECT("`type`"); sql.SELECT("child_type"); + sql.SELECT("show_type"); sql.SELECT("goods_brand_name"); sql.SELECT("goods_brand"); sql.SELECT("goods_label"); @@ -211,6 +216,10 @@ public class GoodsMsgSqlProvider { sql.SET("child_type = #{record.childType,jdbcType=INTEGER}"); } + if (record.getShowType() != null) { + sql.SET("show_type = #{record.showType,jdbcType=INTEGER}"); + } + if (record.getGoodsBrandName() != null) { sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}"); } @@ -292,6 +301,7 @@ public class GoodsMsgSqlProvider { sql.SET("sale_num = #{record.saleNum,jdbcType=INTEGER}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("child_type = #{record.childType,jdbcType=INTEGER}"); + sql.SET("show_type = #{record.showType,jdbcType=INTEGER}"); sql.SET("goods_brand_name = #{record.goodsBrandName,jdbcType=VARCHAR}"); sql.SET("goods_brand = #{record.goodsBrand,jdbcType=BIGINT}"); sql.SET("goods_label = #{record.goodsLabel,jdbcType=VARCHAR}"); @@ -350,6 +360,10 @@ public class GoodsMsgSqlProvider { sql.SET("child_type = #{childType,jdbcType=INTEGER}"); } + if (record.getShowType() != null) { + sql.SET("show_type = #{showType,jdbcType=INTEGER}"); + } + if (record.getGoodsBrandName() != null) { sql.SET("goods_brand_name = #{goodsBrandName,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/GoodsMsg.java b/service/src/main/java/com/hfkj/entity/GoodsMsg.java index 109175c..e648653 100644 --- a/service/src/main/java/com/hfkj/entity/GoodsMsg.java +++ b/service/src/main/java/com/hfkj/entity/GoodsMsg.java @@ -58,6 +58,11 @@ public class GoodsMsg implements Serializable { */ private Integer childType; + /** + * 展示类型:1.正常展示 2.不展示在c端 + */ + private Integer showType; + /** * 商品品牌名称 */ @@ -212,6 +217,14 @@ public class GoodsMsg implements Serializable { this.childType = childType; } + public Integer getShowType() { + return showType; + } + + public void setShowType(Integer showType) { + this.showType = showType; + } + public String getGoodsBrandName() { return goodsBrandName; } @@ -361,6 +374,7 @@ public class GoodsMsg implements Serializable { && (this.getSaleNum() == null ? other.getSaleNum() == null : this.getSaleNum().equals(other.getSaleNum())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getChildType() == null ? other.getChildType() == null : this.getChildType().equals(other.getChildType())) + && (this.getShowType() == null ? other.getShowType() == null : this.getShowType().equals(other.getShowType())) && (this.getGoodsBrandName() == null ? other.getGoodsBrandName() == null : this.getGoodsBrandName().equals(other.getGoodsBrandName())) && (this.getGoodsBrand() == null ? other.getGoodsBrand() == null : this.getGoodsBrand().equals(other.getGoodsBrand())) && (this.getGoodsLabel() == null ? other.getGoodsLabel() == null : this.getGoodsLabel().equals(other.getGoodsLabel())) @@ -392,6 +406,7 @@ public class GoodsMsg implements Serializable { result = prime * result + ((getSaleNum() == null) ? 0 : getSaleNum().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getChildType() == null) ? 0 : getChildType().hashCode()); + result = prime * result + ((getShowType() == null) ? 0 : getShowType().hashCode()); result = prime * result + ((getGoodsBrandName() == null) ? 0 : getGoodsBrandName().hashCode()); result = prime * result + ((getGoodsBrand() == null) ? 0 : getGoodsBrand().hashCode()); result = prime * result + ((getGoodsLabel() == null) ? 0 : getGoodsLabel().hashCode()); @@ -426,6 +441,7 @@ public class GoodsMsg implements Serializable { sb.append(", saleNum=").append(saleNum); sb.append(", type=").append(type); sb.append(", childType=").append(childType); + sb.append(", showType=").append(showType); sb.append(", goodsBrandName=").append(goodsBrandName); sb.append(", goodsBrand=").append(goodsBrand); sb.append(", goodsLabel=").append(goodsLabel); diff --git a/service/src/main/java/com/hfkj/entity/GoodsMsgExample.java b/service/src/main/java/com/hfkj/entity/GoodsMsgExample.java index 8795d18..ee723aa 100644 --- a/service/src/main/java/com/hfkj/entity/GoodsMsgExample.java +++ b/service/src/main/java/com/hfkj/entity/GoodsMsgExample.java @@ -695,6 +695,66 @@ public class GoodsMsgExample { return (Criteria) this; } + public Criteria andShowTypeIsNull() { + addCriterion("show_type is null"); + return (Criteria) this; + } + + public Criteria andShowTypeIsNotNull() { + addCriterion("show_type is not null"); + return (Criteria) this; + } + + public Criteria andShowTypeEqualTo(Integer value) { + addCriterion("show_type =", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotEqualTo(Integer value) { + addCriterion("show_type <>", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeGreaterThan(Integer value) { + addCriterion("show_type >", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("show_type >=", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeLessThan(Integer value) { + addCriterion("show_type <", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeLessThanOrEqualTo(Integer value) { + addCriterion("show_type <=", value, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeIn(List values) { + addCriterion("show_type in", values, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotIn(List values) { + addCriterion("show_type not in", values, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeBetween(Integer value1, Integer value2) { + addCriterion("show_type between", value1, value2, "showType"); + return (Criteria) this; + } + + public Criteria andShowTypeNotBetween(Integer value1, Integer value2) { + addCriterion("show_type not between", value1, value2, "showType"); + return (Criteria) this; + } + public Criteria andGoodsBrandNameIsNull() { addCriterion("goods_brand_name is null"); return (Criteria) this;