袁野 4 months ago committed by yuanye
parent 1100bb7cec
commit 4035bce1da
  1. 40
      service/src/main/java/com/hfkj/dao/CouponDiscountMapper.java
  2. 28
      service/src/main/java/com/hfkj/dao/CouponDiscountSqlProvider.java
  3. 16
      service/src/main/java/com/hfkj/dao/CouponDiscountUserRelMapper.java
  4. 16
      service/src/main/java/com/hfkj/dao/CouponDiscountUserRelSqlProvider.java
  5. 32
      service/src/main/java/com/hfkj/entity/CouponDiscount.java
  6. 130
      service/src/main/java/com/hfkj/entity/CouponDiscountExample.java
  7. 18
      service/src/main/java/com/hfkj/entity/CouponDiscountUserRel.java
  8. 58
      service/src/main/java/com/hfkj/entity/CouponDiscountUserRelExample.java

@ -39,23 +39,21 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
@Insert({ @Insert({
"insert into coupon_discount (`name`, img, ", "insert into coupon_discount (platform_code, `name`, ",
"`type`, platform, ", "img, `type`, `condition`, ",
"`condition`, price, ", "price, percentage, ",
"percentage, limit_num, ", "limit_num, effective_day, ",
"effective_day, effective_num, ", "effective_num, sales_end_time, ",
"sales_end_time, create_time, ", "create_time, update_time, ",
"update_time, op_id, ", "op_id, op_name, `status`, ",
"op_name, `status`, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{name,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ", "values (#{platformCode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
"#{type,jdbcType=INTEGER}, #{platform,jdbcType=INTEGER}, ", "#{img,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{condition,jdbcType=DECIMAL}, ",
"#{condition,jdbcType=DECIMAL}, #{price,jdbcType=DECIMAL}, ", "#{price,jdbcType=DECIMAL}, #{percentage,jdbcType=DECIMAL}, ",
"#{percentage,jdbcType=DECIMAL}, #{limitNum,jdbcType=INTEGER}, ", "#{limitNum,jdbcType=INTEGER}, #{effectiveDay,jdbcType=INTEGER}, ",
"#{effectiveDay,jdbcType=INTEGER}, #{effectiveNum,jdbcType=INTEGER}, ", "#{effectiveNum,jdbcType=INTEGER}, #{salesEndTime,jdbcType=TIMESTAMP}, ",
"#{salesEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{opName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
@ -68,10 +66,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt {
@SelectProvider(type=CouponDiscountSqlProvider.class, method="selectByExample") @SelectProvider(type=CouponDiscountSqlProvider.class, method="selectByExample")
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
@Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
@Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="platform", property="platform", jdbcType=JdbcType.INTEGER),
@Result(column="condition", property="condition", jdbcType=JdbcType.DECIMAL), @Result(column="condition", property="condition", jdbcType=JdbcType.DECIMAL),
@Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
@Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL), @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL),
@ -92,7 +90,7 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt {
@Select({ @Select({
"select", "select",
"id, `name`, img, `type`, platform, `condition`, price, percentage, limit_num, ", "id, platform_code, `name`, img, `type`, `condition`, price, percentage, limit_num, ",
"effective_day, effective_num, sales_end_time, create_time, update_time, op_id, ", "effective_day, effective_num, sales_end_time, create_time, update_time, op_id, ",
"op_name, `status`, ext_1, ext_2, ext_3", "op_name, `status`, ext_1, ext_2, ext_3",
"from coupon_discount", "from coupon_discount",
@ -100,10 +98,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt {
}) })
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
@Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
@Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="platform", property="platform", jdbcType=JdbcType.INTEGER),
@Result(column="condition", property="condition", jdbcType=JdbcType.DECIMAL), @Result(column="condition", property="condition", jdbcType=JdbcType.DECIMAL),
@Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
@Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL), @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL),
@ -133,10 +131,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt {
@Update({ @Update({
"update coupon_discount", "update coupon_discount",
"set `name` = #{name,jdbcType=VARCHAR},", "set platform_code = #{platformCode,jdbcType=VARCHAR},",
"`name` = #{name,jdbcType=VARCHAR},",
"img = #{img,jdbcType=VARCHAR},", "img = #{img,jdbcType=VARCHAR},",
"`type` = #{type,jdbcType=INTEGER},", "`type` = #{type,jdbcType=INTEGER},",
"platform = #{platform,jdbcType=INTEGER},",
"`condition` = #{condition,jdbcType=DECIMAL},", "`condition` = #{condition,jdbcType=DECIMAL},",
"price = #{price,jdbcType=DECIMAL},", "price = #{price,jdbcType=DECIMAL},",
"percentage = #{percentage,jdbcType=DECIMAL},", "percentage = #{percentage,jdbcType=DECIMAL},",

@ -28,6 +28,10 @@ public class CouponDiscountSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.INSERT_INTO("coupon_discount"); sql.INSERT_INTO("coupon_discount");
if (record.getPlatformCode() != null) {
sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
}
if (record.getName() != null) { if (record.getName() != null) {
sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}"); sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
} }
@ -40,10 +44,6 @@ public class CouponDiscountSqlProvider {
sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
} }
if (record.getPlatform() != null) {
sql.VALUES("platform", "#{platform,jdbcType=INTEGER}");
}
if (record.getCondition() != null) { if (record.getCondition() != null) {
sql.VALUES("`condition`", "#{condition,jdbcType=DECIMAL}"); sql.VALUES("`condition`", "#{condition,jdbcType=DECIMAL}");
} }
@ -114,10 +114,10 @@ public class CouponDiscountSqlProvider {
} else { } else {
sql.SELECT("id"); sql.SELECT("id");
} }
sql.SELECT("platform_code");
sql.SELECT("`name`"); sql.SELECT("`name`");
sql.SELECT("img"); sql.SELECT("img");
sql.SELECT("`type`"); sql.SELECT("`type`");
sql.SELECT("platform");
sql.SELECT("`condition`"); sql.SELECT("`condition`");
sql.SELECT("price"); sql.SELECT("price");
sql.SELECT("percentage"); sql.SELECT("percentage");
@ -154,6 +154,10 @@ public class CouponDiscountSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
} }
if (record.getPlatformCode() != null) {
sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
}
if (record.getName() != null) { if (record.getName() != null) {
sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
} }
@ -166,10 +170,6 @@ public class CouponDiscountSqlProvider {
sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
} }
if (record.getPlatform() != null) {
sql.SET("platform = #{record.platform,jdbcType=INTEGER}");
}
if (record.getCondition() != null) { if (record.getCondition() != null) {
sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}"); sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}");
} }
@ -239,10 +239,10 @@ public class CouponDiscountSqlProvider {
sql.UPDATE("coupon_discount"); sql.UPDATE("coupon_discount");
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
sql.SET("img = #{record.img,jdbcType=VARCHAR}"); sql.SET("img = #{record.img,jdbcType=VARCHAR}");
sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
sql.SET("platform = #{record.platform,jdbcType=INTEGER}");
sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}"); sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}");
sql.SET("price = #{record.price,jdbcType=DECIMAL}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}");
sql.SET("percentage = #{record.percentage,jdbcType=DECIMAL}"); sql.SET("percentage = #{record.percentage,jdbcType=DECIMAL}");
@ -268,6 +268,10 @@ public class CouponDiscountSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.UPDATE("coupon_discount"); sql.UPDATE("coupon_discount");
if (record.getPlatformCode() != null) {
sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
}
if (record.getName() != null) { if (record.getName() != null) {
sql.SET("`name` = #{name,jdbcType=VARCHAR}"); sql.SET("`name` = #{name,jdbcType=VARCHAR}");
} }
@ -280,10 +284,6 @@ public class CouponDiscountSqlProvider {
sql.SET("`type` = #{type,jdbcType=INTEGER}"); sql.SET("`type` = #{type,jdbcType=INTEGER}");
} }
if (record.getPlatform() != null) {
sql.SET("platform = #{platform,jdbcType=INTEGER}");
}
if (record.getCondition() != null) { if (record.getCondition() != null) {
sql.SET("`condition` = #{condition,jdbcType=DECIMAL}"); sql.SET("`condition` = #{condition,jdbcType=DECIMAL}");
} }

@ -39,14 +39,14 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
@Insert({ @Insert({
"insert into coupon_discount_user_rel (platform, discount_id, ", "insert into coupon_discount_user_rel (platform_code, discount_id, ",
"discount_name, discount_img, ", "discount_name, discount_img, ",
"discount_type, discount_condition, ", "discount_type, discount_condition, ",
"discount_price, discount_percentage, ", "discount_price, discount_percentage, ",
"user_id, `status`, use_time, ", "user_id, `status`, use_time, ",
"create_time, use_end_time, ", "create_time, use_end_time, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{platform,jdbcType=INTEGER}, #{discountId,jdbcType=BIGINT}, ", "values (#{platformCode,jdbcType=VARCHAR}, #{discountId,jdbcType=BIGINT}, ",
"#{discountName,jdbcType=VARCHAR}, #{discountImg,jdbcType=VARCHAR}, ", "#{discountName,jdbcType=VARCHAR}, #{discountImg,jdbcType=VARCHAR}, ",
"#{discountType,jdbcType=INTEGER}, #{discountCondition,jdbcType=DECIMAL}, ", "#{discountType,jdbcType=INTEGER}, #{discountCondition,jdbcType=DECIMAL}, ",
"#{discountPrice,jdbcType=DECIMAL}, #{discountPercentage,jdbcType=DECIMAL}, ", "#{discountPrice,jdbcType=DECIMAL}, #{discountPercentage,jdbcType=DECIMAL}, ",
@ -64,7 +64,7 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper
@SelectProvider(type=CouponDiscountUserRelSqlProvider.class, method="selectByExample") @SelectProvider(type=CouponDiscountUserRelSqlProvider.class, method="selectByExample")
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="platform", property="platform", jdbcType=JdbcType.INTEGER), @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT), @Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT),
@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),
@ -85,15 +85,15 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper
@Select({ @Select({
"select", "select",
"id, platform, discount_id, discount_name, discount_img, discount_type, discount_condition, ", "id, platform_code, discount_id, discount_name, discount_img, discount_type, ",
"discount_price, discount_percentage, user_id, `status`, use_time, create_time, ", "discount_condition, discount_price, discount_percentage, user_id, `status`, ",
"use_end_time, ext_1, ext_2, ext_3", "use_time, create_time, use_end_time, ext_1, ext_2, ext_3",
"from coupon_discount_user_rel", "from coupon_discount_user_rel",
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="platform", property="platform", jdbcType=JdbcType.INTEGER), @Result(column="platform_code", property="platformCode", jdbcType=JdbcType.VARCHAR),
@Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT), @Result(column="discount_id", property="discountId", jdbcType=JdbcType.BIGINT),
@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),
@ -123,7 +123,7 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper
@Update({ @Update({
"update coupon_discount_user_rel", "update coupon_discount_user_rel",
"set platform = #{platform,jdbcType=INTEGER},", "set platform_code = #{platformCode,jdbcType=VARCHAR},",
"discount_id = #{discountId,jdbcType=BIGINT},", "discount_id = #{discountId,jdbcType=BIGINT},",
"discount_name = #{discountName,jdbcType=VARCHAR},", "discount_name = #{discountName,jdbcType=VARCHAR},",
"discount_img = #{discountImg,jdbcType=VARCHAR},", "discount_img = #{discountImg,jdbcType=VARCHAR},",

@ -28,8 +28,8 @@ public class CouponDiscountUserRelSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.INSERT_INTO("coupon_discount_user_rel"); sql.INSERT_INTO("coupon_discount_user_rel");
if (record.getPlatform() != null) { if (record.getPlatformCode() != null) {
sql.VALUES("platform", "#{platform,jdbcType=INTEGER}"); sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}");
} }
if (record.getDiscountId() != null) { if (record.getDiscountId() != null) {
@ -102,7 +102,7 @@ public class CouponDiscountUserRelSqlProvider {
} else { } else {
sql.SELECT("id"); sql.SELECT("id");
} }
sql.SELECT("platform"); sql.SELECT("platform_code");
sql.SELECT("discount_id"); sql.SELECT("discount_id");
sql.SELECT("discount_name"); sql.SELECT("discount_name");
sql.SELECT("discount_img"); sql.SELECT("discount_img");
@ -139,8 +139,8 @@ public class CouponDiscountUserRelSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
} }
if (record.getPlatform() != null) { if (record.getPlatformCode() != null) {
sql.SET("platform = #{record.platform,jdbcType=INTEGER}"); sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
} }
if (record.getDiscountId() != null) { if (record.getDiscountId() != null) {
@ -212,7 +212,7 @@ public class CouponDiscountUserRelSqlProvider {
sql.UPDATE("coupon_discount_user_rel"); sql.UPDATE("coupon_discount_user_rel");
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("platform = #{record.platform,jdbcType=INTEGER}"); sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}");
sql.SET("discount_id = #{record.discountId,jdbcType=BIGINT}"); sql.SET("discount_id = #{record.discountId,jdbcType=BIGINT}");
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}");
@ -238,8 +238,8 @@ public class CouponDiscountUserRelSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.UPDATE("coupon_discount_user_rel"); sql.UPDATE("coupon_discount_user_rel");
if (record.getPlatform() != null) { if (record.getPlatformCode() != null) {
sql.SET("platform = #{platform,jdbcType=INTEGER}"); sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}");
} }
if (record.getDiscountId() != null) { if (record.getDiscountId() != null) {

@ -19,6 +19,11 @@ public class CouponDiscount implements Serializable {
*/ */
private Long id; private Long id;
/**
* 登录平台code
*/
private String platformCode;
/** /**
* 优惠券名称 * 优惠券名称
*/ */
@ -34,11 +39,6 @@ public class CouponDiscount implements Serializable {
*/ */
private Integer type; private Integer type;
/**
* 1普惠GO 2:v家园 3:省直机关
*/
private Integer platform;
/** /**
* 优惠券条件(满减价格) * 优惠券条件(满减价格)
*/ */
@ -115,6 +115,14 @@ public class CouponDiscount implements Serializable {
this.id = id; this.id = id;
} }
public String getPlatformCode() {
return platformCode;
}
public void setPlatformCode(String platformCode) {
this.platformCode = platformCode;
}
public String getName() { public String getName() {
return name; return name;
} }
@ -139,14 +147,6 @@ public class CouponDiscount implements Serializable {
this.type = type; this.type = type;
} }
public Integer getPlatform() {
return platform;
}
public void setPlatform(Integer platform) {
this.platform = platform;
}
public BigDecimal getCondition() { public BigDecimal getCondition() {
return condition; return condition;
} }
@ -280,10 +280,10 @@ public class CouponDiscount implements Serializable {
} }
CouponDiscount other = (CouponDiscount) that; CouponDiscount other = (CouponDiscount) 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.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getPlatform() == null ? other.getPlatform() == null : this.getPlatform().equals(other.getPlatform()))
&& (this.getCondition() == null ? other.getCondition() == null : this.getCondition().equals(other.getCondition())) && (this.getCondition() == null ? other.getCondition() == null : this.getCondition().equals(other.getCondition()))
&& (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
&& (this.getPercentage() == null ? other.getPercentage() == null : this.getPercentage().equals(other.getPercentage())) && (this.getPercentage() == null ? other.getPercentage() == null : this.getPercentage().equals(other.getPercentage()))
@ -306,10 +306,10 @@ public class CouponDiscount implements Serializable {
final int prime = 31; final int prime = 31;
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 + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode()); result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getPlatform() == null) ? 0 : getPlatform().hashCode());
result = prime * result + ((getCondition() == null) ? 0 : getCondition().hashCode()); result = prime * result + ((getCondition() == null) ? 0 : getCondition().hashCode());
result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
result = prime * result + ((getPercentage() == null) ? 0 : getPercentage().hashCode()); result = prime * result + ((getPercentage() == null) ? 0 : getPercentage().hashCode());
@ -335,10 +335,10 @@ public class CouponDiscount implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", platformCode=").append(platformCode);
sb.append(", name=").append(name); sb.append(", name=").append(name);
sb.append(", img=").append(img); sb.append(", img=").append(img);
sb.append(", type=").append(type); sb.append(", type=").append(type);
sb.append(", platform=").append(platform);
sb.append(", condition=").append(condition); sb.append(", condition=").append(condition);
sb.append(", price=").append(price); sb.append(", price=").append(price);
sb.append(", percentage=").append(percentage); sb.append(", percentage=").append(percentage);

@ -186,6 +186,76 @@ public class CouponDiscountExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformCodeIsNull() {
addCriterion("platform_code is null");
return (Criteria) this;
}
public Criteria andPlatformCodeIsNotNull() {
addCriterion("platform_code is not null");
return (Criteria) this;
}
public Criteria andPlatformCodeEqualTo(String value) {
addCriterion("platform_code =", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeNotEqualTo(String value) {
addCriterion("platform_code <>", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeGreaterThan(String value) {
addCriterion("platform_code >", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
addCriterion("platform_code >=", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeLessThan(String value) {
addCriterion("platform_code <", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
addCriterion("platform_code <=", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeLike(String value) {
addCriterion("platform_code like", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeNotLike(String value) {
addCriterion("platform_code not like", value, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeIn(List<String> values) {
addCriterion("platform_code in", values, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeNotIn(List<String> values) {
addCriterion("platform_code not in", values, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeBetween(String value1, String value2) {
addCriterion("platform_code between", value1, value2, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeNotBetween(String value1, String value2) {
addCriterion("platform_code not between", value1, value2, "platformCode");
return (Criteria) this;
}
public Criteria andNameIsNull() { public Criteria andNameIsNull() {
addCriterion("`name` is null"); addCriterion("`name` is null");
return (Criteria) this; return (Criteria) this;
@ -386,66 +456,6 @@ public class CouponDiscountExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformIsNull() {
addCriterion("platform is null");
return (Criteria) this;
}
public Criteria andPlatformIsNotNull() {
addCriterion("platform is not null");
return (Criteria) this;
}
public Criteria andPlatformEqualTo(Integer value) {
addCriterion("platform =", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformNotEqualTo(Integer value) {
addCriterion("platform <>", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformGreaterThan(Integer value) {
addCriterion("platform >", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformGreaterThanOrEqualTo(Integer value) {
addCriterion("platform >=", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformLessThan(Integer value) {
addCriterion("platform <", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformLessThanOrEqualTo(Integer value) {
addCriterion("platform <=", value, "platform");
return (Criteria) this;
}
public Criteria andPlatformIn(List<Integer> values) {
addCriterion("platform in", values, "platform");
return (Criteria) this;
}
public Criteria andPlatformNotIn(List<Integer> values) {
addCriterion("platform not in", values, "platform");
return (Criteria) this;
}
public Criteria andPlatformBetween(Integer value1, Integer value2) {
addCriterion("platform between", value1, value2, "platform");
return (Criteria) this;
}
public Criteria andPlatformNotBetween(Integer value1, Integer value2) {
addCriterion("platform not between", value1, value2, "platform");
return (Criteria) this;
}
public Criteria andConditionIsNull() { public Criteria andConditionIsNull() {
addCriterion("`condition` is null"); addCriterion("`condition` is null");
return (Criteria) this; return (Criteria) this;

@ -20,9 +20,9 @@ public class CouponDiscountUserRel implements Serializable {
private Long id; private Long id;
/** /**
* 1普惠GO 2:v家园 3:省直机关 * 登录平台code
*/ */
private Integer platform; private String platformCode;
/** /**
* 优惠券id * 优惠券id
@ -100,12 +100,12 @@ public class CouponDiscountUserRel implements Serializable {
this.id = id; this.id = id;
} }
public Integer getPlatform() { public String getPlatformCode() {
return platform; return platformCode;
} }
public void setPlatform(Integer platform) { public void setPlatformCode(String platformCode) {
this.platform = platform; this.platformCode = platformCode;
} }
public Long getDiscountId() { public Long getDiscountId() {
@ -241,7 +241,7 @@ public class CouponDiscountUserRel implements Serializable {
} }
CouponDiscountUserRel other = (CouponDiscountUserRel) that; CouponDiscountUserRel other = (CouponDiscountUserRel) 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.getPlatform() == null ? other.getPlatform() == null : this.getPlatform().equals(other.getPlatform())) && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
&& (this.getDiscountId() == null ? other.getDiscountId() == null : this.getDiscountId().equals(other.getDiscountId())) && (this.getDiscountId() == null ? other.getDiscountId() == null : this.getDiscountId().equals(other.getDiscountId()))
&& (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()))
@ -264,7 +264,7 @@ public class CouponDiscountUserRel implements Serializable {
final int prime = 31; final int prime = 31;
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 + ((getPlatform() == null) ? 0 : getPlatform().hashCode()); result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
result = prime * result + ((getDiscountId() == null) ? 0 : getDiscountId().hashCode()); result = prime * result + ((getDiscountId() == null) ? 0 : getDiscountId().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());
@ -290,7 +290,7 @@ public class CouponDiscountUserRel implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", platform=").append(platform); sb.append(", platformCode=").append(platformCode);
sb.append(", discountId=").append(discountId); sb.append(", discountId=").append(discountId);
sb.append(", discountName=").append(discountName); sb.append(", discountName=").append(discountName);
sb.append(", discountImg=").append(discountImg); sb.append(", discountImg=").append(discountImg);

@ -186,63 +186,73 @@ public class CouponDiscountUserRelExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformIsNull() { public Criteria andPlatformCodeIsNull() {
addCriterion("platform is null"); addCriterion("platform_code is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformIsNotNull() { public Criteria andPlatformCodeIsNotNull() {
addCriterion("platform is not null"); addCriterion("platform_code is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformEqualTo(Integer value) { public Criteria andPlatformCodeEqualTo(String value) {
addCriterion("platform =", value, "platform"); addCriterion("platform_code =", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformNotEqualTo(Integer value) { public Criteria andPlatformCodeNotEqualTo(String value) {
addCriterion("platform <>", value, "platform"); addCriterion("platform_code <>", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformGreaterThan(Integer value) { public Criteria andPlatformCodeGreaterThan(String value) {
addCriterion("platform >", value, "platform"); addCriterion("platform_code >", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformGreaterThanOrEqualTo(Integer value) { public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) {
addCriterion("platform >=", value, "platform"); addCriterion("platform_code >=", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformLessThan(Integer value) { public Criteria andPlatformCodeLessThan(String value) {
addCriterion("platform <", value, "platform"); addCriterion("platform_code <", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformLessThanOrEqualTo(Integer value) { public Criteria andPlatformCodeLessThanOrEqualTo(String value) {
addCriterion("platform <=", value, "platform"); addCriterion("platform_code <=", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformIn(List<Integer> values) { public Criteria andPlatformCodeLike(String value) {
addCriterion("platform in", values, "platform"); addCriterion("platform_code like", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformNotIn(List<Integer> values) { public Criteria andPlatformCodeNotLike(String value) {
addCriterion("platform not in", values, "platform"); addCriterion("platform_code not like", value, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformBetween(Integer value1, Integer value2) { public Criteria andPlatformCodeIn(List<String> values) {
addCriterion("platform between", value1, value2, "platform"); addCriterion("platform_code in", values, "platformCode");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlatformNotBetween(Integer value1, Integer value2) { public Criteria andPlatformCodeNotIn(List<String> values) {
addCriterion("platform not between", value1, value2, "platform"); addCriterion("platform_code not in", values, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeBetween(String value1, String value2) {
addCriterion("platform_code between", value1, value2, "platformCode");
return (Criteria) this;
}
public Criteria andPlatformCodeNotBetween(String value1, String value2) {
addCriterion("platform_code not between", value1, value2, "platformCode");
return (Criteria) this; return (Criteria) this;
} }

Loading…
Cancel
Save