提交代码

hai-service/src/main/java/com/hai/dao/GoodsDetailMapper.java

@@ -40,21 +40,23 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt {
 
     @Insert({
         "insert into goods_detail (company_id, goods_type_name, ",
-        "goods_type, `name`, ",
+        "goods_type, goods_label, ",
-        "list_describe, goods_describe, ",
+        "`name`, list_describe, ",
-        "list_img, banner_img, ",
+        "goods_describe, list_img, ",
-        "detail_img, `status`, ",
+        "banner_img, detail_img, ",
-        "create_time, update_time, ",
+        "`status`, create_time, ",
-        "op_id, op_name, ext_1, ",
+        "update_time, op_id, ",
-        "ext_2, ext_3)",
+        "op_name, ext_1, ext_2, ",
+        "ext_3)",
         "values (#{companyId,jdbcType=BIGINT}, #{goodsTypeName,jdbcType=VARCHAR}, ",
-        "#{goodsType,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, ",
+        "#{goodsType,jdbcType=BIGINT}, #{goodsLabel,jdbcType=VARCHAR}, ",
-        "#{listDescribe,jdbcType=VARCHAR}, #{goodsDescribe,jdbcType=VARCHAR}, ",
+        "#{name,jdbcType=VARCHAR}, #{listDescribe,jdbcType=VARCHAR}, ",
-        "#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ",
+        "#{goodsDescribe,jdbcType=VARCHAR}, #{listImg,jdbcType=VARCHAR}, ",
-        "#{detailImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
+        "#{bannerImg,jdbcType=VARCHAR}, #{detailImg,jdbcType=VARCHAR}, ",
-        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
-        "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
+        "#{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(GoodsDetail record);
@@ -69,6 +71,7 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt {
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_label", property="goodsLabel", jdbcType=JdbcType.VARCHAR),
         @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
         @Result(column="list_describe", property="listDescribe", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_describe", property="goodsDescribe", jdbcType=JdbcType.VARCHAR),
@@ -88,9 +91,9 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt {
 
     @Select({
         "select",
-        "id, company_id, goods_type_name, goods_type, `name`, list_describe, goods_describe, ",
+        "id, company_id, goods_type_name, goods_type, goods_label, `name`, list_describe, ",
-        "list_img, banner_img, detail_img, `status`, create_time, update_time, op_id, ",
+        "goods_describe, list_img, banner_img, detail_img, `status`, create_time, update_time, ",
-        "op_name, ext_1, ext_2, ext_3",
+        "op_id, op_name, ext_1, ext_2, ext_3",
         "from goods_detail",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -99,6 +102,7 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt {
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT),
+        @Result(column="goods_label", property="goodsLabel", jdbcType=JdbcType.VARCHAR),
         @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
         @Result(column="list_describe", property="listDescribe", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_describe", property="goodsDescribe", jdbcType=JdbcType.VARCHAR),
@@ -130,6 +134,7 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt {
         "set company_id = #{companyId,jdbcType=BIGINT},",
           "goods_type_name = #{goodsTypeName,jdbcType=VARCHAR},",
           "goods_type = #{goodsType,jdbcType=BIGINT},",
+          "goods_label = #{goodsLabel,jdbcType=VARCHAR},",
           "`name` = #{name,jdbcType=VARCHAR},",
           "list_describe = #{listDescribe,jdbcType=VARCHAR},",
           "goods_describe = #{goodsDescribe,jdbcType=VARCHAR},",

hai-service/src/main/java/com/hai/dao/GoodsDetailSqlProvider.java

@@ -40,6 +40,10 @@ public class GoodsDetailSqlProvider {
             sql.VALUES("goods_type", "#{goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getGoodsLabel() != null) {
+            sql.VALUES("goods_label", "#{goodsLabel,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
         }
@@ -109,6 +113,7 @@ public class GoodsDetailSqlProvider {
         sql.SELECT("company_id");
         sql.SELECT("goods_type_name");
         sql.SELECT("goods_type");
+        sql.SELECT("goods_label");
         sql.SELECT("`name`");
         sql.SELECT("list_describe");
         sql.SELECT("goods_describe");
@@ -156,6 +161,10 @@ public class GoodsDetailSqlProvider {
             sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getGoodsLabel() != null) {
+            sql.SET("goods_label = #{record.goodsLabel,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
         }
@@ -224,6 +233,7 @@ public class GoodsDetailSqlProvider {
         sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
         sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}");
         sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}");
+        sql.SET("goods_label = #{record.goodsLabel,jdbcType=VARCHAR}");
         sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
         sql.SET("list_describe = #{record.listDescribe,jdbcType=VARCHAR}");
         sql.SET("goods_describe = #{record.goodsDescribe,jdbcType=VARCHAR}");
@@ -260,6 +270,10 @@ public class GoodsDetailSqlProvider {
             sql.SET("goods_type = #{goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getGoodsLabel() != null) {
+            sql.SET("goods_label = #{goodsLabel,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.SET("`name` = #{name,jdbcType=VARCHAR}");
         }

hai-service/src/main/java/com/hai/entity/GoodsDetail.java

@@ -33,6 +33,11 @@ public class GoodsDetail implements Serializable {
      */
     private Long goodsType;
 
+    /**
+     * 商品标签
+     */
+    private String goodsLabel;
+
     /**
      * 商品名称
      */
@@ -64,7 +69,7 @@ public class GoodsDetail implements Serializable {
     private String detailImg;
 
     /**
-     * 商品状态：0:删除 1:上线 2:编辑中 3:审核中
+     * 商品状态：0:删除 1:上线 2:编辑中
      */
     private Integer status;
 
@@ -137,6 +142,14 @@ public class GoodsDetail implements Serializable {
         this.goodsType = goodsType;
     }
 
+    public String getGoodsLabel() {
+        return goodsLabel;
+    }
+
+    public void setGoodsLabel(String goodsLabel) {
+        this.goodsLabel = goodsLabel;
+    }
+
     public String getName() {
         return name;
     }
@@ -265,6 +278,7 @@ public class GoodsDetail implements Serializable {
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName()))
             && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType()))
+            && (this.getGoodsLabel() == null ? other.getGoodsLabel() == null : this.getGoodsLabel().equals(other.getGoodsLabel()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getListDescribe() == null ? other.getListDescribe() == null : this.getListDescribe().equals(other.getListDescribe()))
             && (this.getGoodsDescribe() == null ? other.getGoodsDescribe() == null : this.getGoodsDescribe().equals(other.getGoodsDescribe()))
@@ -289,6 +303,7 @@ public class GoodsDetail implements Serializable {
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode());
         result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode());
+        result = prime * result + ((getGoodsLabel() == null) ? 0 : getGoodsLabel().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
         result = prime * result + ((getListDescribe() == null) ? 0 : getListDescribe().hashCode());
         result = prime * result + ((getGoodsDescribe() == null) ? 0 : getGoodsDescribe().hashCode());
@@ -316,6 +331,7 @@ public class GoodsDetail implements Serializable {
         sb.append(", companyId=").append(companyId);
         sb.append(", goodsTypeName=").append(goodsTypeName);
         sb.append(", goodsType=").append(goodsType);
+        sb.append(", goodsLabel=").append(goodsLabel);
         sb.append(", name=").append(name);
         sb.append(", listDescribe=").append(listDescribe);
         sb.append(", goodsDescribe=").append(goodsDescribe);

hai-service/src/main/java/com/hai/entity/GoodsDetailExample.java

@@ -375,6 +375,76 @@ public class GoodsDetailExample {
             return (Criteria) this;
         }
 
+        public Criteria andGoodsLabelIsNull() {
+            addCriterion("goods_label is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelIsNotNull() {
+            addCriterion("goods_label is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelEqualTo(String value) {
+            addCriterion("goods_label =", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelNotEqualTo(String value) {
+            addCriterion("goods_label <>", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelGreaterThan(String value) {
+            addCriterion("goods_label >", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelGreaterThanOrEqualTo(String value) {
+            addCriterion("goods_label >=", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelLessThan(String value) {
+            addCriterion("goods_label <", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelLessThanOrEqualTo(String value) {
+            addCriterion("goods_label <=", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelLike(String value) {
+            addCriterion("goods_label like", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelNotLike(String value) {
+            addCriterion("goods_label not like", value, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelIn(List<String> values) {
+            addCriterion("goods_label in", values, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelNotIn(List<String> values) {
+            addCriterion("goods_label not in", values, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelBetween(String value1, String value2) {
+            addCriterion("goods_label between", value1, value2, "goodsLabel");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLabelNotBetween(String value1, String value2) {
+            addCriterion("goods_label not between", value1, value2, "goodsLabel");
+            return (Criteria) this;
+        }
+
         public Criteria andNameIsNull() {
             addCriterion("`name` is null");
             return (Criteria) this;