From 4035bce1da2ec31b4591026f4b5a0601560c841b Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Wed, 17 Jul 2024 15:07:52 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/CouponDiscountMapper.java | 40 +++--- .../hfkj/dao/CouponDiscountSqlProvider.java | 28 ++-- .../hfkj/dao/CouponDiscountUserRelMapper.java | 16 +-- .../dao/CouponDiscountUserRelSqlProvider.java | 16 +-- .../java/com/hfkj/entity/CouponDiscount.java | 32 ++--- .../hfkj/entity/CouponDiscountExample.java | 130 ++++++++++-------- .../hfkj/entity/CouponDiscountUserRel.java | 18 +-- .../entity/CouponDiscountUserRelExample.java | 58 ++++---- 8 files changed, 178 insertions(+), 160 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/CouponDiscountMapper.java b/service/src/main/java/com/hfkj/dao/CouponDiscountMapper.java index 77fadcd..cda54e4 100644 --- a/service/src/main/java/com/hfkj/dao/CouponDiscountMapper.java +++ b/service/src/main/java/com/hfkj/dao/CouponDiscountMapper.java @@ -39,23 +39,21 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into coupon_discount (`name`, img, ", - "`type`, platform, ", - "`condition`, price, ", - "percentage, limit_num, ", - "effective_day, effective_num, ", - "sales_end_time, create_time, ", - "update_time, op_id, ", - "op_name, `status`, ", + "insert into coupon_discount (platform_code, `name`, ", + "img, `type`, `condition`, ", + "price, percentage, ", + "limit_num, effective_day, ", + "effective_num, sales_end_time, ", + "create_time, update_time, ", + "op_id, op_name, `status`, ", "ext_1, ext_2, ext_3)", - "values (#{name,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ", - "#{type,jdbcType=INTEGER}, #{platform,jdbcType=INTEGER}, ", - "#{condition,jdbcType=DECIMAL}, #{price,jdbcType=DECIMAL}, ", - "#{percentage,jdbcType=DECIMAL}, #{limitNum,jdbcType=INTEGER}, ", - "#{effectiveDay,jdbcType=INTEGER}, #{effectiveNum,jdbcType=INTEGER}, ", - "#{salesEndTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", - "#{opName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "values (#{platformCode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ", + "#{img,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{condition,jdbcType=DECIMAL}, ", + "#{price,jdbcType=DECIMAL}, #{percentage,jdbcType=DECIMAL}, ", + "#{limitNum,jdbcType=INTEGER}, #{effectiveDay,jdbcType=INTEGER}, ", + "#{effectiveNum,jdbcType=INTEGER}, #{salesEndTime,jdbcType=TIMESTAMP}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -68,10 +66,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt { @SelectProvider(type=CouponDiscountSqlProvider.class, method="selectByExample") @Results({ @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="img", property="img", jdbcType=JdbcType.VARCHAR), @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="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL), @@ -92,7 +90,7 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt { @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, ", "op_name, `status`, ext_1, ext_2, ext_3", "from coupon_discount", @@ -100,10 +98,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt { }) @Results({ @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="img", property="img", jdbcType=JdbcType.VARCHAR), @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="price", property="price", jdbcType=JdbcType.DECIMAL), @Result(column="percentage", property="percentage", jdbcType=JdbcType.DECIMAL), @@ -133,10 +131,10 @@ public interface CouponDiscountMapper extends CouponDiscountMapperExt { @Update({ "update coupon_discount", - "set `name` = #{name,jdbcType=VARCHAR},", + "set platform_code = #{platformCode,jdbcType=VARCHAR},", + "`name` = #{name,jdbcType=VARCHAR},", "img = #{img,jdbcType=VARCHAR},", "`type` = #{type,jdbcType=INTEGER},", - "platform = #{platform,jdbcType=INTEGER},", "`condition` = #{condition,jdbcType=DECIMAL},", "price = #{price,jdbcType=DECIMAL},", "percentage = #{percentage,jdbcType=DECIMAL},", diff --git a/service/src/main/java/com/hfkj/dao/CouponDiscountSqlProvider.java b/service/src/main/java/com/hfkj/dao/CouponDiscountSqlProvider.java index 9097b6a..3e65cad 100644 --- a/service/src/main/java/com/hfkj/dao/CouponDiscountSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/CouponDiscountSqlProvider.java @@ -28,6 +28,10 @@ public class CouponDiscountSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("coupon_discount"); + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); + } + if (record.getName() != null) { sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}"); } @@ -40,10 +44,6 @@ public class CouponDiscountSqlProvider { sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); } - if (record.getPlatform() != null) { - sql.VALUES("platform", "#{platform,jdbcType=INTEGER}"); - } - if (record.getCondition() != null) { sql.VALUES("`condition`", "#{condition,jdbcType=DECIMAL}"); } @@ -114,10 +114,10 @@ public class CouponDiscountSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("platform_code"); sql.SELECT("`name`"); sql.SELECT("img"); sql.SELECT("`type`"); - sql.SELECT("platform"); sql.SELECT("`condition`"); sql.SELECT("price"); sql.SELECT("percentage"); @@ -154,6 +154,10 @@ public class CouponDiscountSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); + } + if (record.getName() != null) { sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); } @@ -166,10 +170,6 @@ public class CouponDiscountSqlProvider { sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); } - if (record.getPlatform() != null) { - sql.SET("platform = #{record.platform,jdbcType=INTEGER}"); - } - if (record.getCondition() != null) { sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}"); } @@ -239,10 +239,10 @@ public class CouponDiscountSqlProvider { sql.UPDATE("coupon_discount"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); sql.SET("img = #{record.img,jdbcType=VARCHAR}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); - sql.SET("platform = #{record.platform,jdbcType=INTEGER}"); sql.SET("`condition` = #{record.condition,jdbcType=DECIMAL}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}"); sql.SET("percentage = #{record.percentage,jdbcType=DECIMAL}"); @@ -268,6 +268,10 @@ public class CouponDiscountSqlProvider { SQL sql = new SQL(); sql.UPDATE("coupon_discount"); + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); + } + if (record.getName() != null) { sql.SET("`name` = #{name,jdbcType=VARCHAR}"); } @@ -280,10 +284,6 @@ public class CouponDiscountSqlProvider { sql.SET("`type` = #{type,jdbcType=INTEGER}"); } - if (record.getPlatform() != null) { - sql.SET("platform = #{platform,jdbcType=INTEGER}"); - } - if (record.getCondition() != null) { sql.SET("`condition` = #{condition,jdbcType=DECIMAL}"); } diff --git a/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelMapper.java b/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelMapper.java index eee9de5..eaad347 100644 --- a/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelMapper.java +++ b/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelMapper.java @@ -39,14 +39,14 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper int deleteByPrimaryKey(Long id); @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_type, discount_condition, ", "discount_price, discount_percentage, ", "user_id, `status`, use_time, ", "create_time, use_end_time, ", "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}, ", "#{discountType,jdbcType=INTEGER}, #{discountCondition,jdbcType=DECIMAL}, ", "#{discountPrice,jdbcType=DECIMAL}, #{discountPercentage,jdbcType=DECIMAL}, ", @@ -64,7 +64,7 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper @SelectProvider(type=CouponDiscountUserRelSqlProvider.class, method="selectByExample") @Results({ @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_name", property="discountName", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @@ -85,15 +85,15 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper @Select({ "select", - "id, platform, discount_id, discount_name, discount_img, discount_type, discount_condition, ", - "discount_price, discount_percentage, user_id, `status`, use_time, create_time, ", - "use_end_time, ext_1, ext_2, ext_3", + "id, platform_code, discount_id, discount_name, discount_img, discount_type, ", + "discount_condition, discount_price, discount_percentage, user_id, `status`, ", + "use_time, create_time, use_end_time, ext_1, ext_2, ext_3", "from coupon_discount_user_rel", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @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_name", property="discountName", jdbcType=JdbcType.VARCHAR), @Result(column="discount_img", property="discountImg", jdbcType=JdbcType.VARCHAR), @@ -123,7 +123,7 @@ public interface CouponDiscountUserRelMapper extends CouponDiscountUserRelMapper @Update({ "update coupon_discount_user_rel", - "set platform = #{platform,jdbcType=INTEGER},", + "set platform_code = #{platformCode,jdbcType=VARCHAR},", "discount_id = #{discountId,jdbcType=BIGINT},", "discount_name = #{discountName,jdbcType=VARCHAR},", "discount_img = #{discountImg,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelSqlProvider.java b/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelSqlProvider.java index 96d9102..d2fddc2 100644 --- a/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/CouponDiscountUserRelSqlProvider.java @@ -28,8 +28,8 @@ public class CouponDiscountUserRelSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("coupon_discount_user_rel"); - if (record.getPlatform() != null) { - sql.VALUES("platform", "#{platform,jdbcType=INTEGER}"); + if (record.getPlatformCode() != null) { + sql.VALUES("platform_code", "#{platformCode,jdbcType=VARCHAR}"); } if (record.getDiscountId() != null) { @@ -102,7 +102,7 @@ public class CouponDiscountUserRelSqlProvider { } else { sql.SELECT("id"); } - sql.SELECT("platform"); + sql.SELECT("platform_code"); sql.SELECT("discount_id"); sql.SELECT("discount_name"); sql.SELECT("discount_img"); @@ -139,8 +139,8 @@ public class CouponDiscountUserRelSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } - if (record.getPlatform() != null) { - sql.SET("platform = #{record.platform,jdbcType=INTEGER}"); + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{record.platformCode,jdbcType=VARCHAR}"); } if (record.getDiscountId() != null) { @@ -212,7 +212,7 @@ public class CouponDiscountUserRelSqlProvider { sql.UPDATE("coupon_discount_user_rel"); 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_name = #{record.discountName,jdbcType=VARCHAR}"); sql.SET("discount_img = #{record.discountImg,jdbcType=VARCHAR}"); @@ -238,8 +238,8 @@ public class CouponDiscountUserRelSqlProvider { SQL sql = new SQL(); sql.UPDATE("coupon_discount_user_rel"); - if (record.getPlatform() != null) { - sql.SET("platform = #{platform,jdbcType=INTEGER}"); + if (record.getPlatformCode() != null) { + sql.SET("platform_code = #{platformCode,jdbcType=VARCHAR}"); } if (record.getDiscountId() != null) { diff --git a/service/src/main/java/com/hfkj/entity/CouponDiscount.java b/service/src/main/java/com/hfkj/entity/CouponDiscount.java index 8e5305b..30bb5c2 100644 --- a/service/src/main/java/com/hfkj/entity/CouponDiscount.java +++ b/service/src/main/java/com/hfkj/entity/CouponDiscount.java @@ -19,6 +19,11 @@ public class CouponDiscount implements Serializable { */ private Long id; + /** + * 登录平台code + */ + private String platformCode; + /** * 优惠券名称 */ @@ -34,11 +39,6 @@ public class CouponDiscount implements Serializable { */ private Integer type; - /** - * 1：普惠GO 2:v家园 3:省直机关 - */ - private Integer platform; - /** * 优惠券条件(满减价格) */ @@ -115,6 +115,14 @@ public class CouponDiscount implements Serializable { this.id = id; } + public String getPlatformCode() { + return platformCode; + } + + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; + } + public String getName() { return name; } @@ -139,14 +147,6 @@ public class CouponDiscount implements Serializable { this.type = type; } - public Integer getPlatform() { - return platform; - } - - public void setPlatform(Integer platform) { - this.platform = platform; - } - public BigDecimal getCondition() { return condition; } @@ -280,10 +280,10 @@ public class CouponDiscount implements Serializable { } CouponDiscount other = (CouponDiscount) that; 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.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) && (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.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) && (this.getPercentage() == null ? other.getPercentage() == null : this.getPercentage().equals(other.getPercentage())) @@ -306,10 +306,10 @@ public class CouponDiscount implements Serializable { final int prime = 31; int result = 1; 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 + ((getImg() == null) ? 0 : getImg().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 + ((getPrice() == null) ? 0 : getPrice().hashCode()); result = prime * result + ((getPercentage() == null) ? 0 : getPercentage().hashCode()); @@ -335,10 +335,10 @@ public class CouponDiscount implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", platformCode=").append(platformCode); sb.append(", name=").append(name); sb.append(", img=").append(img); sb.append(", type=").append(type); - sb.append(", platform=").append(platform); sb.append(", condition=").append(condition); sb.append(", price=").append(price); sb.append(", percentage=").append(percentage); diff --git a/service/src/main/java/com/hfkj/entity/CouponDiscountExample.java b/service/src/main/java/com/hfkj/entity/CouponDiscountExample.java index a99b2f1..22a64b9 100644 --- a/service/src/main/java/com/hfkj/entity/CouponDiscountExample.java +++ b/service/src/main/java/com/hfkj/entity/CouponDiscountExample.java @@ -186,6 +186,76 @@ public class CouponDiscountExample { 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 values) { + addCriterion("platform_code in", values, "platformCode"); + return (Criteria) this; + } + + public Criteria andPlatformCodeNotIn(List 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() { addCriterion("`name` is null"); return (Criteria) this; @@ -386,66 +456,6 @@ public class CouponDiscountExample { 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 values) { - addCriterion("platform in", values, "platform"); - return (Criteria) this; - } - - public Criteria andPlatformNotIn(List 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() { addCriterion("`condition` is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/CouponDiscountUserRel.java b/service/src/main/java/com/hfkj/entity/CouponDiscountUserRel.java index 502f44a..c88fe16 100644 --- a/service/src/main/java/com/hfkj/entity/CouponDiscountUserRel.java +++ b/service/src/main/java/com/hfkj/entity/CouponDiscountUserRel.java @@ -20,9 +20,9 @@ public class CouponDiscountUserRel implements Serializable { private Long id; /** - * 1：普惠GO 2:v家园 3:省直机关 + * 登录平台code */ - private Integer platform; + private String platformCode; /** * 优惠券id @@ -100,12 +100,12 @@ public class CouponDiscountUserRel implements Serializable { this.id = id; } - public Integer getPlatform() { - return platform; + public String getPlatformCode() { + return platformCode; } - public void setPlatform(Integer platform) { - this.platform = platform; + public void setPlatformCode(String platformCode) { + this.platformCode = platformCode; } public Long getDiscountId() { @@ -241,7 +241,7 @@ public class CouponDiscountUserRel implements Serializable { } CouponDiscountUserRel other = (CouponDiscountUserRel) that; 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.getDiscountName() == null ? other.getDiscountName() == null : this.getDiscountName().equals(other.getDiscountName())) && (this.getDiscountImg() == null ? other.getDiscountImg() == null : this.getDiscountImg().equals(other.getDiscountImg())) @@ -264,7 +264,7 @@ public class CouponDiscountUserRel implements Serializable { final int prime = 31; int result = 1; 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 + ((getDiscountName() == null) ? 0 : getDiscountName().hashCode()); result = prime * result + ((getDiscountImg() == null) ? 0 : getDiscountImg().hashCode()); @@ -290,7 +290,7 @@ public class CouponDiscountUserRel implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", platform=").append(platform); + sb.append(", platformCode=").append(platformCode); sb.append(", discountId=").append(discountId); sb.append(", discountName=").append(discountName); sb.append(", discountImg=").append(discountImg); diff --git a/service/src/main/java/com/hfkj/entity/CouponDiscountUserRelExample.java b/service/src/main/java/com/hfkj/entity/CouponDiscountUserRelExample.java index cf1b4da..2418906 100644 --- a/service/src/main/java/com/hfkj/entity/CouponDiscountUserRelExample.java +++ b/service/src/main/java/com/hfkj/entity/CouponDiscountUserRelExample.java @@ -186,63 +186,73 @@ public class CouponDiscountUserRelExample { return (Criteria) this; } - public Criteria andPlatformIsNull() { - addCriterion("platform is null"); + public Criteria andPlatformCodeIsNull() { + addCriterion("platform_code is null"); return (Criteria) this; } - public Criteria andPlatformIsNotNull() { - addCriterion("platform is not null"); + public Criteria andPlatformCodeIsNotNull() { + addCriterion("platform_code is not null"); return (Criteria) this; } - public Criteria andPlatformEqualTo(Integer value) { - addCriterion("platform =", value, "platform"); + public Criteria andPlatformCodeEqualTo(String value) { + addCriterion("platform_code =", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformNotEqualTo(Integer value) { - addCriterion("platform <>", value, "platform"); + public Criteria andPlatformCodeNotEqualTo(String value) { + addCriterion("platform_code <>", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformGreaterThan(Integer value) { - addCriterion("platform >", value, "platform"); + public Criteria andPlatformCodeGreaterThan(String value) { + addCriterion("platform_code >", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformGreaterThanOrEqualTo(Integer value) { - addCriterion("platform >=", value, "platform"); + public Criteria andPlatformCodeGreaterThanOrEqualTo(String value) { + addCriterion("platform_code >=", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformLessThan(Integer value) { - addCriterion("platform <", value, "platform"); + public Criteria andPlatformCodeLessThan(String value) { + addCriterion("platform_code <", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformLessThanOrEqualTo(Integer value) { - addCriterion("platform <=", value, "platform"); + public Criteria andPlatformCodeLessThanOrEqualTo(String value) { + addCriterion("platform_code <=", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformIn(List values) { - addCriterion("platform in", values, "platform"); + public Criteria andPlatformCodeLike(String value) { + addCriterion("platform_code like", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformNotIn(List values) { - addCriterion("platform not in", values, "platform"); + public Criteria andPlatformCodeNotLike(String value) { + addCriterion("platform_code not like", value, "platformCode"); return (Criteria) this; } - public Criteria andPlatformBetween(Integer value1, Integer value2) { - addCriterion("platform between", value1, value2, "platform"); + public Criteria andPlatformCodeIn(List values) { + addCriterion("platform_code in", values, "platformCode"); return (Criteria) this; } - public Criteria andPlatformNotBetween(Integer value1, Integer value2) { - addCriterion("platform not between", value1, value2, "platform"); + public Criteria andPlatformCodeNotIn(List 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; }