hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev-discount
袁野 3 years ago
parent 0869cb7dc4 3c62b8c231
commit 9c99a14217
8 changed files with 215 additions and 215 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 49
      hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java
  2. 42
      hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java
  3. 37
      hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java
  4. 14
      hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java
  5. 48
      hai-service/src/main/java/com/hai/entity/HighCouponPackage.java
  6. 164
      hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java
  7. 16
      hai-service/src/main/java/com/hai/entity/HighDiscount.java
  8. 60
      hai-service/src/main/java/com/hai/entity/HighDiscountExample.java

49
hai-service/src/main/java/com/hai/dao/HighCouponPackageMapper.java
Unescape View File

@ -39,24 +39,24 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt {
int deleteByPrimaryKey(Integer id); int deleteByPrimaryKey(Integer id);
@Insert({ @Insert({
"insert into high_coupon_package (company_id, title, ", "insert into high_coupon_package (company_id, using_attribution, ",
"brand_id, goods_type_id, ", "title, sales_type, ",
"sales_type, effective_tiem, ", "effective_tiem, price, ",
"price, purchase_num, ", "purchase_num, list_img, ",
"list_img, banner_img, ", "banner_img, details_img, ",
"details_img, created_user_id, ", "created_user_id, created_time, ",
"created_time, updated_user_id, ", "updated_user_id, updated_time, ",
"updated_time, `status`, ", "`status`, ext_1, ext_2, ",
"ext_1, ext_2, ext_3)", "ext_3)",
"values (#{companyId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, ", "values (#{companyId,jdbcType=INTEGER}, #{usingAttribution,jdbcType=INTEGER}, ",
"#{brandId,jdbcType=INTEGER}, #{goodsTypeId,jdbcType=INTEGER}, ", "#{title,jdbcType=VARCHAR}, #{salesType,jdbcType=INTEGER}, ",
"#{salesType,jdbcType=INTEGER}, #{effectiveTiem,jdbcType=TIMESTAMP}, ", "#{effectiveTiem,jdbcType=TIMESTAMP}, #{price,jdbcType=DECIMAL}, ",
"#{price,jdbcType=DECIMAL}, #{purchaseNum,jdbcType=INTEGER}, ", "#{purchaseNum,jdbcType=INTEGER}, #{listImg,jdbcType=VARCHAR}, ",
"#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ", "#{bannerImg,jdbcType=VARCHAR}, #{detailsImg,jdbcType=VARCHAR}, ",
"#{detailsImg,jdbcType=VARCHAR}, #{createdUserId,jdbcType=INTEGER}, ", "#{createdUserId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, ",
"#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=INTEGER}, ", "#{updatedUserId,jdbcType=INTEGER}, #{updatedTime,jdbcType=TIMESTAMP}, ",
"#{updatedTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" "#{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighCouponPackage record); int insert(HighCouponPackage record);
@ -69,9 +69,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt {
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), @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="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="sales_type", property="salesType", jdbcType=JdbcType.INTEGER),
@Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP), @Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP),
@Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
@ -92,8 +91,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt {
@Select({ @Select({
"select", "select",
"id, company_id, title, brand_id, goods_type_id, sales_type, effective_tiem, ", "id, company_id, using_attribution, title, sales_type, effective_tiem, price, ",
"price, purchase_num, list_img, banner_img, details_img, created_user_id, created_time, ", "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", "updated_user_id, updated_time, `status`, ext_1, ext_2, ext_3",
"from high_coupon_package", "from high_coupon_package",
"where id = #{id,jdbcType=INTEGER}" "where id = #{id,jdbcType=INTEGER}"
@ -101,9 +100,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt {
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), @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="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="sales_type", property="salesType", jdbcType=JdbcType.INTEGER),
@Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP), @Result(column="effective_tiem", property="effectiveTiem", jdbcType=JdbcType.TIMESTAMP),
@Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
@ -134,9 +132,8 @@ public interface HighCouponPackageMapper extends HighCouponPackageMapperExt {
@Update({ @Update({
"update high_coupon_package", "update high_coupon_package",
"set company_id = #{companyId,jdbcType=INTEGER},", "set company_id = #{companyId,jdbcType=INTEGER},",
"using_attribution = #{usingAttribution,jdbcType=INTEGER},",
"title = #{title,jdbcType=VARCHAR},", "title = #{title,jdbcType=VARCHAR},",
"brand_id = #{brandId,jdbcType=INTEGER},",
"goods_type_id = #{goodsTypeId,jdbcType=INTEGER},",
"sales_type = #{salesType,jdbcType=INTEGER},", "sales_type = #{salesType,jdbcType=INTEGER},",
"effective_tiem = #{effectiveTiem,jdbcType=TIMESTAMP},", "effective_tiem = #{effectiveTiem,jdbcType=TIMESTAMP},",
"price = #{price,jdbcType=DECIMAL},", "price = #{price,jdbcType=DECIMAL},",

42
hai-service/src/main/java/com/hai/dao/HighCouponPackageSqlProvider.java
Unescape View File

@ -32,16 +32,12 @@ public class HighCouponPackageSqlProvider {
sql.VALUES("company_id", "#{companyId,jdbcType=INTEGER}"); sql.VALUES("company_id", "#{companyId,jdbcType=INTEGER}");
} }
if (record.getTitle() != null) { if (record.getUsingAttribution() != null) {
sql.VALUES("title", "#{title,jdbcType=VARCHAR}"); sql.VALUES("using_attribution", "#{usingAttribution,jdbcType=INTEGER}");
} }
if (record.getBrandId() != null) { if (record.getTitle() != null) {
sql.VALUES("brand_id", "#{brandId,jdbcType=INTEGER}"); sql.VALUES("title", "#{title,jdbcType=VARCHAR}");
}
if (record.getGoodsTypeId() != null) {
sql.VALUES("goods_type_id", "#{goodsTypeId,jdbcType=INTEGER}");
} }
if (record.getSalesType() != null) { if (record.getSalesType() != null) {
@ -115,9 +111,8 @@ public class HighCouponPackageSqlProvider {
sql.SELECT("id"); sql.SELECT("id");
} }
sql.SELECT("company_id"); sql.SELECT("company_id");
sql.SELECT("using_attribution");
sql.SELECT("title"); sql.SELECT("title");
sql.SELECT("brand_id");
sql.SELECT("goods_type_id");
sql.SELECT("sales_type"); sql.SELECT("sales_type");
sql.SELECT("effective_tiem"); sql.SELECT("effective_tiem");
sql.SELECT("price"); sql.SELECT("price");
@ -158,16 +153,12 @@ public class HighCouponPackageSqlProvider {
sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}"); sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}");
} }
if (record.getTitle() != null) { if (record.getUsingAttribution() != null) {
sql.SET("title = #{record.title,jdbcType=VARCHAR}"); sql.SET("using_attribution = #{record.usingAttribution,jdbcType=INTEGER}");
}
if (record.getBrandId() != null) {
sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
} }
if (record.getGoodsTypeId() != null) { if (record.getTitle() != null) {
sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=INTEGER}"); sql.SET("title = #{record.title,jdbcType=VARCHAR}");
} }
if (record.getSalesType() != null) { if (record.getSalesType() != null) {
@ -240,9 +231,8 @@ public class HighCouponPackageSqlProvider {
sql.SET("id = #{record.id,jdbcType=INTEGER}"); sql.SET("id = #{record.id,jdbcType=INTEGER}");
sql.SET("company_id = #{record.companyId,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("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("sales_type = #{record.salesType,jdbcType=INTEGER}");
sql.SET("effective_tiem = #{record.effectiveTiem,jdbcType=TIMESTAMP}"); sql.SET("effective_tiem = #{record.effectiveTiem,jdbcType=TIMESTAMP}");
sql.SET("price = #{record.price,jdbcType=DECIMAL}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}");
@ -272,16 +262,12 @@ public class HighCouponPackageSqlProvider {
sql.SET("company_id = #{companyId,jdbcType=INTEGER}"); sql.SET("company_id = #{companyId,jdbcType=INTEGER}");
} }
if (record.getTitle() != null) { if (record.getUsingAttribution() != null) {
sql.SET("title = #{title,jdbcType=VARCHAR}"); sql.SET("using_attribution = #{usingAttribution,jdbcType=INTEGER}");
} }
if (record.getBrandId() != null) { if (record.getTitle() != null) {
sql.SET("brand_id = #{brandId,jdbcType=INTEGER}"); sql.SET("title = #{title,jdbcType=VARCHAR}");
}
if (record.getGoodsTypeId() != null) {
sql.SET("goods_type_id = #{goodsTypeId,jdbcType=INTEGER}");
} }
if (record.getSalesType() != null) { if (record.getSalesType() != null) {

37
hai-service/src/main/java/com/hai/dao/HighDiscountMapper.java
Unescape View File

@ -40,23 +40,23 @@ public interface HighDiscountMapper extends HighDiscountMapperExt {
@Insert({ @Insert({
"insert into high_discount (company_id, discount_key, ", "insert into high_discount (company_id, discount_key, ",
"discount_name, discount_img, ", "using_range, discount_name, ",
"discount_carousel_img, discount_type, ", "discount_img, discount_carousel_img, ",
"discount_condition, discount_price, ", "discount_type, discount_condition, ",
"effective_day, sales_end_time, ", "discount_price, effective_day, ",
"create_time, update_time, ", "sales_end_time, create_time, ",
"operator_id, operator_name, ", "update_time, operator_id, ",
"`status`, ext_1, ext_2, ", "operator_name, `status`, ",
"ext_3)", "ext_1, ext_2, ext_3)",
"values (#{companyId,jdbcType=BIGINT}, #{discountKey,jdbcType=VARCHAR}, ", "values (#{companyId,jdbcType=BIGINT}, #{discountKey,jdbcType=VARCHAR}, ",
"#{discountName,jdbcType=VARCHAR}, #{discountImg,jdbcType=VARCHAR}, ", "#{usingRange,jdbcType=INTEGER}, #{discountName,jdbcType=VARCHAR}, ",
"#{discountCarouselImg,jdbcType=VARCHAR}, #{discountType,jdbcType=INTEGER}, ", "#{discountImg,jdbcType=VARCHAR}, #{discountCarouselImg,jdbcType=VARCHAR}, ",
"#{discountCondition,jdbcType=DECIMAL}, #{discountPrice,jdbcType=DECIMAL}, ", "#{discountType,jdbcType=INTEGER}, #{discountCondition,jdbcType=DECIMAL}, ",
"#{effectiveDay,jdbcType=INTEGER}, #{salesEndTime,jdbcType=TIMESTAMP}, ", "#{discountPrice,jdbcType=DECIMAL}, #{effectiveDay,jdbcType=INTEGER}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{salesEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{operatorId,jdbcType=BIGINT}, ",
"#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", "#{operatorName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{ext3,jdbcType=VARCHAR})" "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
int insert(HighDiscount record); 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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="discount_key", property="discountKey", jdbcType=JdbcType.VARCHAR), @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_name", property="discountName", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_carousel_img", property="discountCarouselImg", jdbcType=JdbcType.VARCHAR), @Result(column="discount_carousel_img", property="discountCarouselImg", jdbcType=JdbcType.VARCHAR),
@ -91,7 +92,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt {
@Select({ @Select({
"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, ", "discount_type, discount_condition, discount_price, effective_day, sales_end_time, ",
"create_time, update_time, operator_id, operator_name, `status`, ext_1, ext_2, ", "create_time, update_time, operator_id, operator_name, `status`, ext_1, ext_2, ",
"ext_3", "ext_3",
@ -102,6 +103,7 @@ public interface HighDiscountMapper extends HighDiscountMapperExt {
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="discount_key", property="discountKey", jdbcType=JdbcType.VARCHAR), @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_name", property="discountName", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_carousel_img", property="discountCarouselImg", 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", "update high_discount",
"set company_id = #{companyId,jdbcType=BIGINT},", "set company_id = #{companyId,jdbcType=BIGINT},",
"discount_key = #{discountKey,jdbcType=VARCHAR},", "discount_key = #{discountKey,jdbcType=VARCHAR},",
"using_range = #{usingRange,jdbcType=INTEGER},",
"discount_name = #{discountName,jdbcType=VARCHAR},", "discount_name = #{discountName,jdbcType=VARCHAR},",
"discount_img = #{discountImg,jdbcType=VARCHAR},", "discount_img = #{discountImg,jdbcType=VARCHAR},",
"discount_carousel_img = #{discountCarouselImg,jdbcType=VARCHAR},", "discount_carousel_img = #{discountCarouselImg,jdbcType=VARCHAR},",

14
hai-service/src/main/java/com/hai/dao/HighDiscountSqlProvider.java
Unescape View File

@ -36,6 +36,10 @@ public class HighDiscountSqlProvider {
sql.VALUES("discount_key", "#{discountKey,jdbcType=VARCHAR}"); sql.VALUES("discount_key", "#{discountKey,jdbcType=VARCHAR}");
} }
if (record.getUsingRange() != null) {
sql.VALUES("using_range", "#{usingRange,jdbcType=INTEGER}");
}
if (record.getDiscountName() != null) { if (record.getDiscountName() != null) {
sql.VALUES("discount_name", "#{discountName,jdbcType=VARCHAR}"); sql.VALUES("discount_name", "#{discountName,jdbcType=VARCHAR}");
} }
@ -112,6 +116,7 @@ public class HighDiscountSqlProvider {
} }
sql.SELECT("company_id"); sql.SELECT("company_id");
sql.SELECT("discount_key"); sql.SELECT("discount_key");
sql.SELECT("using_range");
sql.SELECT("discount_name"); sql.SELECT("discount_name");
sql.SELECT("discount_img"); sql.SELECT("discount_img");
sql.SELECT("discount_carousel_img"); sql.SELECT("discount_carousel_img");
@ -157,6 +162,10 @@ public class HighDiscountSqlProvider {
sql.SET("discount_key = #{record.discountKey,jdbcType=VARCHAR}"); sql.SET("discount_key = #{record.discountKey,jdbcType=VARCHAR}");
} }
if (record.getUsingRange() != null) {
sql.SET("using_range = #{record.usingRange,jdbcType=INTEGER}");
}
if (record.getDiscountName() != null) { if (record.getDiscountName() != null) {
sql.SET("discount_name = #{record.discountName,jdbcType=VARCHAR}"); sql.SET("discount_name = #{record.discountName,jdbcType=VARCHAR}");
} }
@ -232,6 +241,7 @@ public class HighDiscountSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("discount_key = #{record.discountKey,jdbcType=VARCHAR}"); 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_name = #{record.discountName,jdbcType=VARCHAR}");
sql.SET("discount_img = #{record.discountImg,jdbcType=VARCHAR}"); sql.SET("discount_img = #{record.discountImg,jdbcType=VARCHAR}");
sql.SET("discount_carousel_img = #{record.discountCarouselImg,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}"); sql.SET("discount_key = #{discountKey,jdbcType=VARCHAR}");
} }
if (record.getUsingRange() != null) {
sql.SET("using_range = #{usingRange,jdbcType=INTEGER}");
}
if (record.getDiscountName() != null) { if (record.getDiscountName() != null) {
sql.SET("discount_name = #{discountName,jdbcType=VARCHAR}"); sql.SET("discount_name = #{discountName,jdbcType=VARCHAR}");
} }

48
hai-service/src/main/java/com/hai/entity/HighCouponPackage.java
Unescape View File

@ -25,22 +25,17 @@ public class HighCouponPackage implements Serializable {
private Integer companyId; 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; private Integer salesType;
@ -132,28 +127,20 @@ public class HighCouponPackage implements Serializable {
this.companyId = companyId; this.companyId = companyId;
} }
public String getTitle() { public Integer getUsingAttribution() {
return title; return usingAttribution;
} }
public void setTitle(String title) { public void setUsingAttribution(Integer usingAttribution) {
this.title = title; this.usingAttribution = usingAttribution;
}
public Integer getBrandId() {
return brandId;
}
public void setBrandId(Integer brandId) {
this.brandId = brandId;
} }
public Integer getGoodsTypeId() { public String getTitle() {
return goodsTypeId; return title;
} }
public void setGoodsTypeId(Integer goodsTypeId) { public void setTitle(String title) {
this.goodsTypeId = goodsTypeId; this.title = title;
} }
public Integer getSalesType() { public Integer getSalesType() {
@ -290,9 +277,8 @@ public class HighCouponPackage implements Serializable {
HighCouponPackage other = (HighCouponPackage) that; HighCouponPackage other = (HighCouponPackage) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (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.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.getSalesType() == null ? other.getSalesType() == null : this.getSalesType().equals(other.getSalesType()))
&& (this.getEffectiveTiem() == null ? other.getEffectiveTiem() == null : this.getEffectiveTiem().equals(other.getEffectiveTiem())) && (this.getEffectiveTiem() == null ? other.getEffectiveTiem() == null : this.getEffectiveTiem().equals(other.getEffectiveTiem()))
&& (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
@ -316,9 +302,8 @@ public class HighCouponPackage implements Serializable {
int result = 1; int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().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 + ((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 + ((getSalesType() == null) ? 0 : getSalesType().hashCode());
result = prime * result + ((getEffectiveTiem() == null) ? 0 : getEffectiveTiem().hashCode()); result = prime * result + ((getEffectiveTiem() == null) ? 0 : getEffectiveTiem().hashCode());
result = prime * result + ((getPrice() == null) ? 0 : getPrice().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("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", companyId=").append(companyId); sb.append(", companyId=").append(companyId);
sb.append(", usingAttribution=").append(usingAttribution);
sb.append(", title=").append(title); sb.append(", title=").append(title);
sb.append(", brandId=").append(brandId);
sb.append(", goodsTypeId=").append(goodsTypeId);
sb.append(", salesType=").append(salesType); sb.append(", salesType=").append(salesType);
sb.append(", effectiveTiem=").append(effectiveTiem); sb.append(", effectiveTiem=").append(effectiveTiem);
sb.append(", price=").append(price); sb.append(", price=").append(price);

164
hai-service/src/main/java/com/hai/entity/HighCouponPackageExample.java
Unescape View File

@ -246,193 +246,133 @@ public class HighCouponPackageExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTitleIsNull() { public Criteria andUsingAttributionIsNull() {
addCriterion("title is null"); addCriterion("using_attribution 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<String> values) {
addCriterion("title in", values, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTitleNotIn(List<String> values) { public Criteria andUsingAttributionIsNotNull() {
addCriterion("title not in", values, "title"); addCriterion("using_attribution is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTitleBetween(String value1, String value2) { public Criteria andUsingAttributionEqualTo(Integer value) {
addCriterion("title between", value1, value2, "title"); addCriterion("using_attribution =", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTitleNotBetween(String value1, String value2) { public Criteria andUsingAttributionNotEqualTo(Integer value) {
addCriterion("title not between", value1, value2, "title"); addCriterion("using_attribution <>", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdIsNull() { public Criteria andUsingAttributionGreaterThan(Integer value) {
addCriterion("brand_id is null"); addCriterion("using_attribution >", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdIsNotNull() { public Criteria andUsingAttributionGreaterThanOrEqualTo(Integer value) {
addCriterion("brand_id is not null"); addCriterion("using_attribution >=", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdEqualTo(Integer value) { public Criteria andUsingAttributionLessThan(Integer value) {
addCriterion("brand_id =", value, "brandId"); addCriterion("using_attribution <", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdNotEqualTo(Integer value) { public Criteria andUsingAttributionLessThanOrEqualTo(Integer value) {
addCriterion("brand_id <>", value, "brandId"); addCriterion("using_attribution <=", value, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdGreaterThan(Integer value) { public Criteria andUsingAttributionIn(List<Integer> values) {
addCriterion("brand_id >", value, "brandId"); addCriterion("using_attribution in", values, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdGreaterThanOrEqualTo(Integer value) { public Criteria andUsingAttributionNotIn(List<Integer> values) {
addCriterion("brand_id >=", value, "brandId"); addCriterion("using_attribution not in", values, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdLessThan(Integer value) { public Criteria andUsingAttributionBetween(Integer value1, Integer value2) {
addCriterion("brand_id <", value, "brandId"); addCriterion("using_attribution between", value1, value2, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdLessThanOrEqualTo(Integer value) { public Criteria andUsingAttributionNotBetween(Integer value1, Integer value2) {
addCriterion("brand_id <=", value, "brandId"); addCriterion("using_attribution not between", value1, value2, "usingAttribution");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdIn(List<Integer> values) { public Criteria andTitleIsNull() {
addCriterion("brand_id in", values, "brandId"); addCriterion("title is null");
return (Criteria) this;
}
public Criteria andBrandIdNotIn(List<Integer> 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");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBrandIdNotBetween(Integer value1, Integer value2) { public Criteria andTitleIsNotNull() {
addCriterion("brand_id not between", value1, value2, "brandId"); addCriterion("title is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdIsNull() { public Criteria andTitleEqualTo(String value) {
addCriterion("goods_type_id is null"); addCriterion("title =", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdIsNotNull() { public Criteria andTitleNotEqualTo(String value) {
addCriterion("goods_type_id is not null"); addCriterion("title <>", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdEqualTo(Integer value) { public Criteria andTitleGreaterThan(String value) {
addCriterion("goods_type_id =", value, "goodsTypeId"); addCriterion("title >", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdNotEqualTo(Integer value) { public Criteria andTitleGreaterThanOrEqualTo(String value) {
addCriterion("goods_type_id <>", value, "goodsTypeId"); addCriterion("title >=", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdGreaterThan(Integer value) { public Criteria andTitleLessThan(String value) {
addCriterion("goods_type_id >", value, "goodsTypeId"); addCriterion("title <", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdGreaterThanOrEqualTo(Integer value) { public Criteria andTitleLessThanOrEqualTo(String value) {
addCriterion("goods_type_id >=", value, "goodsTypeId"); addCriterion("title <=", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdLessThan(Integer value) { public Criteria andTitleLike(String value) {
addCriterion("goods_type_id <", value, "goodsTypeId"); addCriterion("title like", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdLessThanOrEqualTo(Integer value) { public Criteria andTitleNotLike(String value) {
addCriterion("goods_type_id <=", value, "goodsTypeId"); addCriterion("title not like", value, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdIn(List<Integer> values) { public Criteria andTitleIn(List<String> values) {
addCriterion("goods_type_id in", values, "goodsTypeId"); addCriterion("title in", values, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdNotIn(List<Integer> values) { public Criteria andTitleNotIn(List<String> values) {
addCriterion("goods_type_id not in", values, "goodsTypeId"); addCriterion("title not in", values, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdBetween(Integer value1, Integer value2) { public Criteria andTitleBetween(String value1, String value2) {
addCriterion("goods_type_id between", value1, value2, "goodsTypeId"); addCriterion("title between", value1, value2, "title");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGoodsTypeIdNotBetween(Integer value1, Integer value2) { public Criteria andTitleNotBetween(String value1, String value2) {
addCriterion("goods_type_id not between", value1, value2, "goodsTypeId"); addCriterion("title not between", value1, value2, "title");
return (Criteria) this; return (Criteria) this;
} }

16
hai-service/src/main/java/com/hai/entity/HighDiscount.java
Unescape View File

@ -31,6 +31,11 @@ public class HighDiscount extends HighDiscountModel implements Serializable {
*/ */
private String discountKey; private String discountKey;
/**
* 使用归属
*/
private Integer usingRange;
/** /**
* 优惠券名称 * 优惠券名称
*/ */
@ -128,6 +133,14 @@ public class HighDiscount extends HighDiscountModel implements Serializable {
this.discountKey = discountKey; this.discountKey = discountKey;
} }
public Integer getUsingRange() {
return usingRange;
}
public void setUsingRange(Integer usingRange) {
this.usingRange = usingRange;
}
public String getDiscountName() { public String getDiscountName() {
return discountName; 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())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getDiscountKey() == null ? other.getDiscountKey() == null : this.getDiscountKey().equals(other.getDiscountKey())) && (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.getDiscountName() == null ? other.getDiscountName() == null : this.getDiscountName().equals(other.getDiscountName()))
&& (this.getDiscountImg() == null ? other.getDiscountImg() == null : this.getDiscountImg().equals(other.getDiscountImg())) && (this.getDiscountImg() == null ? other.getDiscountImg() == null : this.getDiscountImg().equals(other.getDiscountImg()))
&& (this.getDiscountCarouselImg() == null ? other.getDiscountCarouselImg() == null : this.getDiscountCarouselImg().equals(other.getDiscountCarouselImg())) && (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 + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getDiscountKey() == null) ? 0 : getDiscountKey().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 + ((getDiscountName() == null) ? 0 : getDiscountName().hashCode());
result = prime * result + ((getDiscountImg() == null) ? 0 : getDiscountImg().hashCode()); result = prime * result + ((getDiscountImg() == null) ? 0 : getDiscountImg().hashCode());
result = prime * result + ((getDiscountCarouselImg() == null) ? 0 : getDiscountCarouselImg().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(", id=").append(id);
sb.append(", companyId=").append(companyId); sb.append(", companyId=").append(companyId);
sb.append(", discountKey=").append(discountKey); sb.append(", discountKey=").append(discountKey);
sb.append(", usingRange=").append(usingRange);
sb.append(", discountName=").append(discountName); sb.append(", discountName=").append(discountName);
sb.append(", discountImg=").append(discountImg); sb.append(", discountImg=").append(discountImg);
sb.append(", discountCarouselImg=").append(discountCarouselImg); sb.append(", discountCarouselImg=").append(discountCarouselImg);

60
hai-service/src/main/java/com/hai/entity/HighDiscountExample.java
Unescape View File

@ -316,6 +316,66 @@ public class HighDiscountExample {
return (Criteria) this; 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<Integer> values) {
addCriterion("using_range in", values, "usingRange");
return (Criteria) this;
}
public Criteria andUsingRangeNotIn(List<Integer> 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() { public Criteria andDiscountNameIsNull() {
addCriterion("discount_name is null"); addCriterion("discount_name is null");
return (Criteria) this; return (Criteria) this;

Write Preview
Loading…
Cancel
Save