From 3c62b8c231d1e9b6ca13dd6d046e5a359a6ca03b Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 24 Nov 2021 14:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4diam?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hai/dao/HighCouponPackageMapper.java | 49 +++--- .../hai/dao/HighCouponPackageSqlProvider.java | 42 ++--- .../java/com/hai/dao/HighDiscountMapper.java | 37 ++-- .../com/hai/dao/HighDiscountSqlProvider.java | 14 ++ .../com/hai/entity/HighCouponPackage.java | 48 ++--- .../hai/entity/HighCouponPackageExample.java | 164 ++++++------------ .../java/com/hai/entity/HighDiscount.java | 16 ++ .../com/hai/entity/HighDiscountExample.java | 60 +++++++ 8 files changed, 215 insertions(+), 215 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java b/hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java index 8dd06da5..add5e0de 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java @@ -39,24 +39,24 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt { int deleteByPrimaryKey(Integer id); @Insert({ - "insert into high_coupon_package (company_id, title, ", - "brand_id, goods_type_id, ", - "sales_type, effective_tiem, ", - "price, purchase_num, ", - "list_img, banner_img, ", - "details_img, created_user_id, ", - "created_time, updated_user_id, ", - "updated_time, `status`, ", - "ext_1, ext_2, ext_3)", - "values (#{companyId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, ", - "#{brandId,jdbcType=INTEGER}, #{goodsTypeId,jdbcType=INTEGER}, ", - "#{salesType,jdbcType=INTEGER}, #{effectiveTiem,jdbcType=TIMESTAMP}, ", - "#{price,jdbcType=DECIMAL}, #{purchaseNum,jdbcType=INTEGER}, ", - "#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ", - "#{detailsImg,jdbcType=VARCHAR}, #{createdUserId,jdbcType=INTEGER}, ", - "#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=INTEGER}, ", - "#{updatedTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "insert into high_coupon_package (company_id, using_attribution, ", + "title, sales_type, ", + "effective_tiem, price, ", + "purchase_num, list_img, ", + "banner_img, details_img, ", + "created_user_id, created_time, ", + "updated_user_id, updated_time, ", + "`status`, ext_1, ext_2, ", + "ext_3)", + "values (#{companyId,jdbcType=INTEGER}, #{usingAttribution,jdbcType=INTEGER}, ", + "#{title,jdbcType=VARCHAR}, #{salesType,jdbcType=INTEGER}, ", + "#{effectiveTiem,jdbcType=TIMESTAMP}, #{price,jdbcType=DECIMAL}, ", + "#{purchaseNum,jdbcType=INTEGER}, #{listImg,jdbcType=VARCHAR}, ", + "#{bannerImg,jdbcType=VARCHAR}, #{detailsImg,jdbcType=VARCHAR}, ", + "#{createdUserId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, ", + "#{updatedUserId,jdbcType=INTEGER}, #{updatedTime,jdbcType=TIMESTAMP}, ", + "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", + "#{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighCouponPackage record); @@ -69,9 +69,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt { @Results({ @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), + @Result(column="using_attribution", property="usingAttribution", jdbcType=JdbcType.INTEGER), @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR), - @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER), - @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.INTEGER), @Result(column="sales_type", property="salesType", jdbcType=JdbcType.INTEGER), @Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @@ -92,8 +91,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt { @Select({ "select", - "id, company_id, title, brand_id, goods_type_id, sales_type, effective_tiem, ", - "price, purchase_num, list_img, banner_img, details_img, created_user_id, created_time, ", + "id, company_id, using_attribution, title, sales_type, effective_tiem, price, ", + "purchase_num, list_img, banner_img, details_img, created_user_id, created_time, ", "updated_user_id, updated_time, `status`, ext_1, ext_2, ext_3", "from high_coupon_package", "where id = #{id,jdbcType=INTEGER}" @@ -101,9 +100,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt { @Results({ @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), + @Result(column="using_attribution", property="usingAttribution", jdbcType=JdbcType.INTEGER), @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR), - @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER), - @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.INTEGER), @Result(column="sales_type", property="salesType", jdbcType=JdbcType.INTEGER), @Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @@ -134,9 +132,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt { @Update({ "update high_coupon_package", "set company_id = #{companyId,jdbcType=INTEGER},", + "using_attribution = #{usingAttribution,jdbcType=INTEGER},", "title = #{title,jdbcType=VARCHAR},", - "brand_id = #{brandId,jdbcType=INTEGER},", - "goods_type_id = #{goodsTypeId,jdbcType=INTEGER},", "sales_type = #{salesType,jdbcType=INTEGER},", "effective_tiem = #{effectiveTiem,jdbcType=TIMESTAMP},", "price = #{price,jdbcType=DECIMAL},", diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java index fc8f09c4..7614e8a3 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java @@ -32,16 +32,12 @@ public class HighCouponPackageSqlProvider { sql.VALUES("company_id", "#{companyId,jdbcType=INTEGER}"); } - if (record.getTitle() != null) { - sql.VALUES("title", "#{title,jdbcType=VARCHAR}"); + if (record.getUsingAttribution() != null) { + sql.VALUES("using_attribution", "#{usingAttribution,jdbcType=INTEGER}"); } - if (record.getBrandId() != null) { - sql.VALUES("brand_id", "#{brandId,jdbcType=INTEGER}"); - } - - if (record.getGoodsTypeId() != null) { - sql.VALUES("goods_type_id", "#{goodsTypeId,jdbcType=INTEGER}"); + if (record.getTitle() != null) { + sql.VALUES("title", "#{title,jdbcType=VARCHAR}"); } if (record.getSalesType() != null) { @@ -115,9 +111,8 @@ public class HighCouponPackageSqlProvider { sql.SELECT("id"); } sql.SELECT("company_id"); + sql.SELECT("using_attribution"); sql.SELECT("title"); - sql.SELECT("brand_id"); - sql.SELECT("goods_type_id"); sql.SELECT("sales_type"); sql.SELECT("effective_tiem"); sql.SELECT("price"); @@ -158,16 +153,12 @@ public class HighCouponPackageSqlProvider { sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}"); } - if (record.getTitle() != null) { - sql.SET("title = #{record.title,jdbcType=VARCHAR}"); - } - - if (record.getBrandId() != null) { - sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}"); + if (record.getUsingAttribution() != null) { + sql.SET("using_attribution = #{record.usingAttribution,jdbcType=INTEGER}"); } - if (record.getGoodsTypeId() != null) { - sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=INTEGER}"); + if (record.getTitle() != null) { + sql.SET("title = #{record.title,jdbcType=VARCHAR}"); } if (record.getSalesType() != null) { @@ -240,9 +231,8 @@ public class HighCouponPackageSqlProvider { sql.SET("id = #{record.id,jdbcType=INTEGER}"); sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}"); + sql.SET("using_attribution = #{record.usingAttribution,jdbcType=INTEGER}"); sql.SET("title = #{record.title,jdbcType=VARCHAR}"); - sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}"); - sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=INTEGER}"); sql.SET("sales_type = #{record.salesType,jdbcType=INTEGER}"); sql.SET("effective_tiem = #{record.effectiveTiem,jdbcType=TIMESTAMP}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}"); @@ -272,16 +262,12 @@ public class HighCouponPackageSqlProvider { sql.SET("company_id = #{companyId,jdbcType=INTEGER}"); } - if (record.getTitle() != null) { - sql.SET("title = #{title,jdbcType=VARCHAR}"); + if (record.getUsingAttribution() != null) { + sql.SET("using_attribution = #{usingAttribution,jdbcType=INTEGER}"); } - if (record.getBrandId() != null) { - sql.SET("brand_id = #{brandId,jdbcType=INTEGER}"); - } - - if (record.getGoodsTypeId() != null) { - sql.SET("goods_type_id = #{goodsTypeId,jdbcType=INTEGER}"); + if (record.getTitle() != null) { + sql.SET("title = #{title,jdbcType=VARCHAR}"); } if (record.getSalesType() != null) { diff --git a/hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java b/hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java index aa95a0f1..7a82d9ba 100644 --- a/hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java @@ -40,23 +40,23 @@ public interface HighDiscountMapper extends HighDiscountMapperExt { @Insert({ "insert into high_discount (company_id, discount_key, ", - "discount_name, discount_img, ", - "discount_carousel_img, discount_type, ", - "discount_condition, discount_price, ", - "effective_day, sales_end_time, ", - "create_time, update_time, ", - "operator_id, operator_name, ", - "`status`, ext_1, ext_2, ", - "ext_3)", + "using_range, discount_name, ", + "discount_img, discount_carousel_img, ", + "discount_type, discount_condition, ", + "discount_price, effective_day, ", + "sales_end_time, create_time, ", + "update_time, operator_id, ", + "operator_name, `status`, ", + "ext_1, ext_2, ext_3)", "values (#{companyId,jdbcType=BIGINT}, #{discountKey,jdbcType=VARCHAR}, ", - "#{discountName,jdbcType=VARCHAR}, #{discountImg,jdbcType=VARCHAR}, ", - "#{discountCarouselImg,jdbcType=VARCHAR}, #{discountType,jdbcType=INTEGER}, ", - "#{discountCondition,jdbcType=DECIMAL}, #{discountPrice,jdbcType=DECIMAL}, ", - "#{effectiveDay,jdbcType=INTEGER}, #{salesEndTime,jdbcType=TIMESTAMP}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{usingRange,jdbcType=INTEGER}, #{discountName,jdbcType=VARCHAR}, ", + "#{discountImg,jdbcType=VARCHAR}, #{discountCarouselImg,jdbcType=VARCHAR}, ", + "#{discountType,jdbcType=INTEGER}, #{discountCondition,jdbcType=DECIMAL}, ", + "#{discountPrice,jdbcType=DECIMAL}, #{effectiveDay,jdbcType=INTEGER}, ", + "#{salesEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{operatorId,jdbcType=BIGINT}, ", + "#{operatorName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighDiscount record); @@ -70,6 +70,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="discount_key", property="discountKey", jdbcType=JdbcType.VARCHAR), + @Result(column="using_range", property="usingRange", jdbcType=JdbcType.INTEGER), @Result(column="discount_name", property="discountName", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @Result(column="discount_carousel_img", property="discountCarouselImg", jdbcType=JdbcType.VARCHAR), @@ -91,7 +92,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt { @Select({ "select", - "id, company_id, discount_key, discount_name, discount_img, discount_carousel_img, ", + "id, company_id, discount_key, using_range, discount_name, discount_img, discount_carousel_img, ", "discount_type, discount_condition, discount_price, effective_day, sales_end_time, ", "create_time, update_time, operator_id, operator_name, `status`, ext_1, ext_2, ", "ext_3", @@ -102,6 +103,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="discount_key", property="discountKey", jdbcType=JdbcType.VARCHAR), + @Result(column="using_range", property="usingRange", jdbcType=JdbcType.INTEGER), @Result(column="discount_name", property="discountName", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @Result(column="discount_carousel_img", property="discountCarouselImg", jdbcType=JdbcType.VARCHAR), @@ -134,6 +136,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt { "update high_discount", "set company_id = #{companyId,jdbcType=BIGINT},", "discount_key = #{discountKey,jdbcType=VARCHAR},", + "using_range = #{usingRange,jdbcType=INTEGER},", "discount_name = #{discountName,jdbcType=VARCHAR},", "discount_img = #{discountImg,jdbcType=VARCHAR},", "discount_carousel_img = #{discountCarouselImg,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java index 0288f21f..c9e0fd3b 100644 --- a/hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java @@ -36,6 +36,10 @@ public class HighDiscountSqlProvider { sql.VALUES("discount_key", "#{discountKey,jdbcType=VARCHAR}"); } + if (record.getUsingRange() != null) { + sql.VALUES("using_range", "#{usingRange,jdbcType=INTEGER}"); + } + if (record.getDiscountName() != null) { sql.VALUES("discount_name", "#{discountName,jdbcType=VARCHAR}"); } @@ -112,6 +116,7 @@ public class HighDiscountSqlProvider { } sql.SELECT("company_id"); sql.SELECT("discount_key"); + sql.SELECT("using_range"); sql.SELECT("discount_name"); sql.SELECT("discount_img"); sql.SELECT("discount_carousel_img"); @@ -157,6 +162,10 @@ public class HighDiscountSqlProvider { sql.SET("discount_key = #{record.discountKey,jdbcType=VARCHAR}"); } + if (record.getUsingRange() != null) { + sql.SET("using_range = #{record.usingRange,jdbcType=INTEGER}"); + } + if (record.getDiscountName() != null) { sql.SET("discount_name = #{record.discountName,jdbcType=VARCHAR}"); } @@ -232,6 +241,7 @@ public class HighDiscountSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("discount_key = #{record.discountKey,jdbcType=VARCHAR}"); + sql.SET("using_range = #{record.usingRange,jdbcType=INTEGER}"); sql.SET("discount_name = #{record.discountName,jdbcType=VARCHAR}"); sql.SET("discount_img = #{record.discountImg,jdbcType=VARCHAR}"); sql.SET("discount_carousel_img = #{record.discountCarouselImg,jdbcType=VARCHAR}"); @@ -266,6 +276,10 @@ public class HighDiscountSqlProvider { sql.SET("discount_key = #{discountKey,jdbcType=VARCHAR}"); } + if (record.getUsingRange() != null) { + sql.SET("using_range = #{usingRange,jdbcType=INTEGER}"); + } + if (record.getDiscountName() != null) { sql.SET("discount_name = #{discountName,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponPackage.java b/hai-service/src/main/java/com/hai/entity/HighCouponPackage.java index 8f39241b..96e60366 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponPackage.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponPackage.java @@ -25,22 +25,17 @@ public class HighCouponPackage implements Serializable { private Integer companyId; /** - * 标题 - */ - private String title; - - /** - * 品牌id + * 使用归属 */ - private Integer brandId; + private Integer usingAttribution; /** - * 商品分类id + * 标题 */ - private Integer goodsTypeId; + private String title; /** - * 优惠券包销售类型 1:售卖 2:赠送 + * 优惠券包销售类型 1:售卖 ： 2 赠送 */ private Integer salesType; @@ -132,28 +127,20 @@ public class HighCouponPackage implements Serializable { this.companyId = companyId; } - public String getTitle() { - return title; + public Integer getUsingAttribution() { + return usingAttribution; } - public void setTitle(String title) { - this.title = title; - } - - public Integer getBrandId() { - return brandId; - } - - public void setBrandId(Integer brandId) { - this.brandId = brandId; + public void setUsingAttribution(Integer usingAttribution) { + this.usingAttribution = usingAttribution; } - public Integer getGoodsTypeId() { - return goodsTypeId; + public String getTitle() { + return title; } - public void setGoodsTypeId(Integer goodsTypeId) { - this.goodsTypeId = goodsTypeId; + public void setTitle(String title) { + this.title = title; } public Integer getSalesType() { @@ -290,9 +277,8 @@ public class HighCouponPackage implements Serializable { HighCouponPackage other = (HighCouponPackage) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) + && (this.getUsingAttribution() == null ? other.getUsingAttribution() == null : this.getUsingAttribution().equals(other.getUsingAttribution())) && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle())) - && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId())) - && (this.getGoodsTypeId() == null ? other.getGoodsTypeId() == null : this.getGoodsTypeId().equals(other.getGoodsTypeId())) && (this.getSalesType() == null ? other.getSalesType() == null : this.getSalesType().equals(other.getSalesType())) && (this.getEffectiveTiem() == null ? other.getEffectiveTiem() == null : this.getEffectiveTiem().equals(other.getEffectiveTiem())) && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) @@ -316,9 +302,8 @@ public class HighCouponPackage implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); + result = prime * result + ((getUsingAttribution() == null) ? 0 : getUsingAttribution().hashCode()); result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode()); - result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode()); - result = prime * result + ((getGoodsTypeId() == null) ? 0 : getGoodsTypeId().hashCode()); result = prime * result + ((getSalesType() == null) ? 0 : getSalesType().hashCode()); result = prime * result + ((getEffectiveTiem() == null) ? 0 : getEffectiveTiem().hashCode()); result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); @@ -345,9 +330,8 @@ public class HighCouponPackage implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", companyId=").append(companyId); + sb.append(", usingAttribution=").append(usingAttribution); sb.append(", title=").append(title); - sb.append(", brandId=").append(brandId); - sb.append(", goodsTypeId=").append(goodsTypeId); sb.append(", salesType=").append(salesType); sb.append(", effectiveTiem=").append(effectiveTiem); sb.append(", price=").append(price); diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java b/hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java index 482e1cca..64a8093f 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java @@ -246,193 +246,133 @@ public class HighCouponPackageExample { return (Criteria) this; } - public Criteria andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); + public Criteria andUsingAttributionIsNull() { + addCriterion("using_attribution is null"); return (Criteria) this; } - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); + public Criteria andUsingAttributionIsNotNull() { + addCriterion("using_attribution is not null"); return (Criteria) this; } - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); + public Criteria andUsingAttributionEqualTo(Integer value) { + addCriterion("using_attribution =", value, "usingAttribution"); return (Criteria) this; } - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); + public Criteria andUsingAttributionNotEqualTo(Integer value) { + addCriterion("using_attribution <>", value, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdIsNull() { - addCriterion("brand_id is null"); + public Criteria andUsingAttributionGreaterThan(Integer value) { + addCriterion("using_attribution >", value, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdIsNotNull() { - addCriterion("brand_id is not null"); + public Criteria andUsingAttributionGreaterThanOrEqualTo(Integer value) { + addCriterion("using_attribution >=", value, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdEqualTo(Integer value) { - addCriterion("brand_id =", value, "brandId"); + public Criteria andUsingAttributionLessThan(Integer value) { + addCriterion("using_attribution <", value, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdNotEqualTo(Integer value) { - addCriterion("brand_id <>", value, "brandId"); + public Criteria andUsingAttributionLessThanOrEqualTo(Integer value) { + addCriterion("using_attribution <=", value, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdGreaterThan(Integer value) { - addCriterion("brand_id >", value, "brandId"); + public Criteria andUsingAttributionIn(List values) { + addCriterion("using_attribution in", values, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdGreaterThanOrEqualTo(Integer value) { - addCriterion("brand_id >=", value, "brandId"); + public Criteria andUsingAttributionNotIn(List values) { + addCriterion("using_attribution not in", values, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdLessThan(Integer value) { - addCriterion("brand_id <", value, "brandId"); + public Criteria andUsingAttributionBetween(Integer value1, Integer value2) { + addCriterion("using_attribution between", value1, value2, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdLessThanOrEqualTo(Integer value) { - addCriterion("brand_id <=", value, "brandId"); + public Criteria andUsingAttributionNotBetween(Integer value1, Integer value2) { + addCriterion("using_attribution not between", value1, value2, "usingAttribution"); return (Criteria) this; } - public Criteria andBrandIdIn(List values) { - addCriterion("brand_id in", values, "brandId"); - return (Criteria) this; - } - - public Criteria andBrandIdNotIn(List values) { - addCriterion("brand_id not in", values, "brandId"); - return (Criteria) this; - } - - public Criteria andBrandIdBetween(Integer value1, Integer value2) { - addCriterion("brand_id between", value1, value2, "brandId"); + public Criteria andTitleIsNull() { + addCriterion("title is null"); return (Criteria) this; } - public Criteria andBrandIdNotBetween(Integer value1, Integer value2) { - addCriterion("brand_id not between", value1, value2, "brandId"); + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); return (Criteria) this; } - public Criteria andGoodsTypeIdIsNull() { - addCriterion("goods_type_id is null"); + public Criteria andTitleEqualTo(String value) { + addCriterion("title =", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdIsNotNull() { - addCriterion("goods_type_id is not null"); + public Criteria andTitleNotEqualTo(String value) { + addCriterion("title <>", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdEqualTo(Integer value) { - addCriterion("goods_type_id =", value, "goodsTypeId"); + public Criteria andTitleGreaterThan(String value) { + addCriterion("title >", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdNotEqualTo(Integer value) { - addCriterion("goods_type_id <>", value, "goodsTypeId"); + public Criteria andTitleGreaterThanOrEqualTo(String value) { + addCriterion("title >=", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdGreaterThan(Integer value) { - addCriterion("goods_type_id >", value, "goodsTypeId"); + public Criteria andTitleLessThan(String value) { + addCriterion("title <", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdGreaterThanOrEqualTo(Integer value) { - addCriterion("goods_type_id >=", value, "goodsTypeId"); + public Criteria andTitleLessThanOrEqualTo(String value) { + addCriterion("title <=", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdLessThan(Integer value) { - addCriterion("goods_type_id <", value, "goodsTypeId"); + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdLessThanOrEqualTo(Integer value) { - addCriterion("goods_type_id <=", value, "goodsTypeId"); + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdIn(List values) { - addCriterion("goods_type_id in", values, "goodsTypeId"); + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdNotIn(List values) { - addCriterion("goods_type_id not in", values, "goodsTypeId"); + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdBetween(Integer value1, Integer value2) { - addCriterion("goods_type_id between", value1, value2, "goodsTypeId"); + public Criteria andTitleBetween(String value1, String value2) { + addCriterion("title between", value1, value2, "title"); return (Criteria) this; } - public Criteria andGoodsTypeIdNotBetween(Integer value1, Integer value2) { - addCriterion("goods_type_id not between", value1, value2, "goodsTypeId"); + public Criteria andTitleNotBetween(String value1, String value2) { + addCriterion("title not between", value1, value2, "title"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/entity/HighDiscount.java b/hai-service/src/main/java/com/hai/entity/HighDiscount.java index 6c597985..32d48bd0 100644 --- a/hai-service/src/main/java/com/hai/entity/HighDiscount.java +++ b/hai-service/src/main/java/com/hai/entity/HighDiscount.java @@ -31,6 +31,11 @@ public class HighDiscount extends HighDiscountModel implements Serializable { */ private String discountKey; + /** + * 使用归属 + */ + private Integer usingRange; + /** * 优惠券名称 */ @@ -128,6 +133,14 @@ public class HighDiscount extends HighDiscountModel implements Serializable { this.discountKey = discountKey; } + public Integer getUsingRange() { + return usingRange; + } + + public void setUsingRange(Integer usingRange) { + this.usingRange = usingRange; + } + public String getDiscountName() { return discountName; } @@ -271,6 +284,7 @@ public class HighDiscount extends HighDiscountModel implements Serializable { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getDiscountKey() == null ? other.getDiscountKey() == null : this.getDiscountKey().equals(other.getDiscountKey())) + && (this.getUsingRange() == null ? other.getUsingRange() == null : this.getUsingRange().equals(other.getUsingRange())) && (this.getDiscountName() == null ? other.getDiscountName() == null : this.getDiscountName().equals(other.getDiscountName())) && (this.getDiscountImg() == null ? other.getDiscountImg() == null : this.getDiscountImg().equals(other.getDiscountImg())) && (this.getDiscountCarouselImg() == null ? other.getDiscountCarouselImg() == null : this.getDiscountCarouselImg().equals(other.getDiscountCarouselImg())) @@ -296,6 +310,7 @@ public class HighDiscount extends HighDiscountModel implements Serializable { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getDiscountKey() == null) ? 0 : getDiscountKey().hashCode()); + result = prime * result + ((getUsingRange() == null) ? 0 : getUsingRange().hashCode()); result = prime * result + ((getDiscountName() == null) ? 0 : getDiscountName().hashCode()); result = prime * result + ((getDiscountImg() == null) ? 0 : getDiscountImg().hashCode()); result = prime * result + ((getDiscountCarouselImg() == null) ? 0 : getDiscountCarouselImg().hashCode()); @@ -324,6 +339,7 @@ public class HighDiscount extends HighDiscountModel implements Serializable { sb.append(", id=").append(id); sb.append(", companyId=").append(companyId); sb.append(", discountKey=").append(discountKey); + sb.append(", usingRange=").append(usingRange); sb.append(", discountName=").append(discountName); sb.append(", discountImg=").append(discountImg); sb.append(", discountCarouselImg=").append(discountCarouselImg); diff --git a/hai-service/src/main/java/com/hai/entity/HighDiscountExample.java b/hai-service/src/main/java/com/hai/entity/HighDiscountExample.java index ce05592e..681eab5c 100644 --- a/hai-service/src/main/java/com/hai/entity/HighDiscountExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighDiscountExample.java @@ -316,6 +316,66 @@ public class HighDiscountExample { return (Criteria) this; } + public Criteria andUsingRangeIsNull() { + addCriterion("using_range is null"); + return (Criteria) this; + } + + public Criteria andUsingRangeIsNotNull() { + addCriterion("using_range is not null"); + return (Criteria) this; + } + + public Criteria andUsingRangeEqualTo(Integer value) { + addCriterion("using_range =", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeNotEqualTo(Integer value) { + addCriterion("using_range <>", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeGreaterThan(Integer value) { + addCriterion("using_range >", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeGreaterThanOrEqualTo(Integer value) { + addCriterion("using_range >=", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeLessThan(Integer value) { + addCriterion("using_range <", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeLessThanOrEqualTo(Integer value) { + addCriterion("using_range <=", value, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeIn(List values) { + addCriterion("using_range in", values, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeNotIn(List values) { + addCriterion("using_range not in", values, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeBetween(Integer value1, Integer value2) { + addCriterion("using_range between", value1, value2, "usingRange"); + return (Criteria) this; + } + + public Criteria andUsingRangeNotBetween(Integer value1, Integer value2) { + addCriterion("using_range not between", value1, value2, "usingRange"); + return (Criteria) this; + } + public Criteria andDiscountNameIsNull() { addCriterion("discount_name is null"); return (Criteria) this;