diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java b/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java index 027e3b7c..034db444 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java @@ -52,7 +52,7 @@ public interface HighCouponMapper extends HighCouponMapperExt { "pay_type, ext_1, ext_2, ", "ext_3, `status`, display_area, ", "coupon_source, distributor, ", - "goodsTypeId, brandId)", + "goods_type_id, brand_id)", "values (#{companyId,jdbcType=BIGINT}, #{merchantId,jdbcType=BIGINT}, ", "#{couponKey,jdbcType=VARCHAR}, #{couponName,jdbcType=VARCHAR}, ", "#{couponPrice,jdbcType=DECIMAL}, #{couponImg,jdbcType=VARCHAR}, ", @@ -66,7 +66,7 @@ public interface HighCouponMapper extends HighCouponMapperExt { "#{payType,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", "#{ext3,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{displayArea,jdbcType=INTEGER}, ", "#{couponSource,jdbcType=INTEGER}, #{distributor,jdbcType=INTEGER}, ", - "#{goodstypeid,jdbcType=INTEGER}, #{brandid,jdbcType=INTEGER})" + "#{goodsTypeId,jdbcType=INTEGER}, #{brandId,jdbcType=INTEGER})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighCoupon record); @@ -106,8 +106,8 @@ public interface HighCouponMapper extends HighCouponMapperExt { @Result(column="display_area", property="displayArea", jdbcType=JdbcType.INTEGER), @Result(column="coupon_source", property="couponSource", jdbcType=JdbcType.INTEGER), @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER), - @Result(column="goodsTypeId", property="goodstypeid", jdbcType=JdbcType.INTEGER), - @Result(column="brandId", property="brandid", jdbcType=JdbcType.INTEGER) + @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.INTEGER), + @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER) }) List selectByExample(HighCouponExample example); @@ -117,7 +117,7 @@ public interface HighCouponMapper extends HighCouponMapperExt { "coupon_carousel_img, coupon_desc, coupon_type, sales_end_time, recycle_day, ", "limit_number, sales_price, discount_price, sales_count, is_present, create_time, ", "update_time, operator_id, operator_name, pay_type, ext_1, ext_2, ext_3, `status`, ", - "display_area, coupon_source, distributor, goodsTypeId, brandId", + "display_area, coupon_source, distributor, goods_type_id, brand_id", "from high_coupon", "where id = #{id,jdbcType=BIGINT}" }) @@ -151,8 +151,8 @@ public interface HighCouponMapper extends HighCouponMapperExt { @Result(column="display_area", property="displayArea", jdbcType=JdbcType.INTEGER), @Result(column="coupon_source", property="couponSource", jdbcType=JdbcType.INTEGER), @Result(column="distributor", property="distributor", jdbcType=JdbcType.INTEGER), - @Result(column="goodsTypeId", property="goodstypeid", jdbcType=JdbcType.INTEGER), - @Result(column="brandId", property="brandid", jdbcType=JdbcType.INTEGER) + @Result(column="goods_type_id", property="goodsTypeId", jdbcType=JdbcType.INTEGER), + @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER) }) HighCoupon selectByPrimaryKey(Long id); @@ -195,8 +195,8 @@ public interface HighCouponMapper extends HighCouponMapperExt { "display_area = #{displayArea,jdbcType=INTEGER},", "coupon_source = #{couponSource,jdbcType=INTEGER},", "distributor = #{distributor,jdbcType=INTEGER},", - "goodsTypeId = #{goodstypeid,jdbcType=INTEGER},", - "brandId = #{brandid,jdbcType=INTEGER}", + "goods_type_id = #{goodsTypeId,jdbcType=INTEGER},", + "brand_id = #{brandId,jdbcType=INTEGER}", "where id = #{id,jdbcType=BIGINT}" }) int updateByPrimaryKey(HighCoupon record); diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java index 2569f295..1f7dd7e8 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java @@ -140,12 +140,12 @@ public class HighCouponSqlProvider { sql.VALUES("distributor", "#{distributor,jdbcType=INTEGER}"); } - if (record.getGoodstypeid() != null) { - sql.VALUES("goodsTypeId", "#{goodstypeid,jdbcType=INTEGER}"); + if (record.getGoodsTypeId() != null) { + sql.VALUES("goods_type_id", "#{goodsTypeId,jdbcType=INTEGER}"); } - if (record.getBrandid() != null) { - sql.VALUES("brandId", "#{brandid,jdbcType=INTEGER}"); + if (record.getBrandId() != null) { + sql.VALUES("brand_id", "#{brandId,jdbcType=INTEGER}"); } return sql.toString(); @@ -186,8 +186,8 @@ public class HighCouponSqlProvider { sql.SELECT("display_area"); sql.SELECT("coupon_source"); sql.SELECT("distributor"); - sql.SELECT("goodsTypeId"); - sql.SELECT("brandId"); + sql.SELECT("goods_type_id"); + sql.SELECT("brand_id"); sql.FROM("high_coupon"); applyWhere(sql, example, false); @@ -321,12 +321,12 @@ public class HighCouponSqlProvider { sql.SET("distributor = #{record.distributor,jdbcType=INTEGER}"); } - if (record.getGoodstypeid() != null) { - sql.SET("goodsTypeId = #{record.goodstypeid,jdbcType=INTEGER}"); + if (record.getGoodsTypeId() != null) { + sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=INTEGER}"); } - if (record.getBrandid() != null) { - sql.SET("brandId = #{record.brandid,jdbcType=INTEGER}"); + if (record.getBrandId() != null) { + sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}"); } applyWhere(sql, example, true); @@ -366,8 +366,8 @@ public class HighCouponSqlProvider { sql.SET("display_area = #{record.displayArea,jdbcType=INTEGER}"); sql.SET("coupon_source = #{record.couponSource,jdbcType=INTEGER}"); sql.SET("distributor = #{record.distributor,jdbcType=INTEGER}"); - sql.SET("goodsTypeId = #{record.goodstypeid,jdbcType=INTEGER}"); - sql.SET("brandId = #{record.brandid,jdbcType=INTEGER}"); + sql.SET("goods_type_id = #{record.goodsTypeId,jdbcType=INTEGER}"); + sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}"); HighCouponExample example = (HighCouponExample) parameter.get("example"); applyWhere(sql, example, true); @@ -490,12 +490,12 @@ public class HighCouponSqlProvider { sql.SET("distributor = #{distributor,jdbcType=INTEGER}"); } - if (record.getGoodstypeid() != null) { - sql.SET("goodsTypeId = #{goodstypeid,jdbcType=INTEGER}"); + if (record.getGoodsTypeId() != null) { + sql.SET("goods_type_id = #{goodsTypeId,jdbcType=INTEGER}"); } - if (record.getBrandid() != null) { - sql.SET("brandId = #{brandid,jdbcType=INTEGER}"); + if (record.getBrandId() != null) { + sql.SET("brand_id = #{brandId,jdbcType=INTEGER}"); } sql.WHERE("id = #{id,jdbcType=BIGINT}"); diff --git a/hai-service/src/main/java/com/hai/entity/HighCoupon.java b/hai-service/src/main/java/com/hai/entity/HighCoupon.java index 7d0bbe48..8cec3113 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCoupon.java +++ b/hai-service/src/main/java/com/hai/entity/HighCoupon.java @@ -155,12 +155,12 @@ public class HighCoupon extends HighCouponModel implements Serializable { /** * 商品类别id */ - private Integer goodstypeid; + private Integer goodsTypeId; /** - * 品牌ID + * 品牌id */ - private Integer brandid; + private Integer brandId; private static final long serialVersionUID = 1L; @@ -396,20 +396,20 @@ public class HighCoupon extends HighCouponModel implements Serializable { this.distributor = distributor; } - public Integer getGoodstypeid() { - return goodstypeid; + public Integer getGoodsTypeId() { + return goodsTypeId; } - public void setGoodstypeid(Integer goodstypeid) { - this.goodstypeid = goodstypeid; + public void setGoodsTypeId(Integer goodsTypeId) { + this.goodsTypeId = goodsTypeId; } - public Integer getBrandid() { - return brandid; + public Integer getBrandId() { + return brandId; } - public void setBrandid(Integer brandid) { - this.brandid = brandid; + public void setBrandId(Integer brandId) { + this.brandId = brandId; } @Override @@ -453,8 +453,8 @@ public class HighCoupon extends HighCouponModel implements Serializable { && (this.getDisplayArea() == null ? other.getDisplayArea() == null : this.getDisplayArea().equals(other.getDisplayArea())) && (this.getCouponSource() == null ? other.getCouponSource() == null : this.getCouponSource().equals(other.getCouponSource())) && (this.getDistributor() == null ? other.getDistributor() == null : this.getDistributor().equals(other.getDistributor())) - && (this.getGoodstypeid() == null ? other.getGoodstypeid() == null : this.getGoodstypeid().equals(other.getGoodstypeid())) - && (this.getBrandid() == null ? other.getBrandid() == null : this.getBrandid().equals(other.getBrandid())); + && (this.getGoodsTypeId() == null ? other.getGoodsTypeId() == null : this.getGoodsTypeId().equals(other.getGoodsTypeId())) + && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId())); } @Override @@ -490,8 +490,8 @@ public class HighCoupon extends HighCouponModel implements Serializable { result = prime * result + ((getDisplayArea() == null) ? 0 : getDisplayArea().hashCode()); result = prime * result + ((getCouponSource() == null) ? 0 : getCouponSource().hashCode()); result = prime * result + ((getDistributor() == null) ? 0 : getDistributor().hashCode()); - result = prime * result + ((getGoodstypeid() == null) ? 0 : getGoodstypeid().hashCode()); - result = prime * result + ((getBrandid() == null) ? 0 : getBrandid().hashCode()); + result = prime * result + ((getGoodsTypeId() == null) ? 0 : getGoodsTypeId().hashCode()); + result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode()); return result; } @@ -530,8 +530,8 @@ public class HighCoupon extends HighCouponModel implements Serializable { sb.append(", displayArea=").append(displayArea); sb.append(", couponSource=").append(couponSource); sb.append(", distributor=").append(distributor); - sb.append(", goodstypeid=").append(goodstypeid); - sb.append(", brandid=").append(brandid); + sb.append(", goodsTypeId=").append(goodsTypeId); + sb.append(", brandId=").append(brandId); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponExample.java b/hai-service/src/main/java/com/hai/entity/HighCouponExample.java index 3e2c184e..a8dd6480 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponExample.java @@ -1956,123 +1956,123 @@ public class HighCouponExample { return (Criteria) this; } - public Criteria andGoodstypeidIsNull() { - addCriterion("goodsTypeId is null"); + public Criteria andGoodsTypeIdIsNull() { + addCriterion("goods_type_id is null"); return (Criteria) this; } - public Criteria andGoodstypeidIsNotNull() { - addCriterion("goodsTypeId is not null"); + public Criteria andGoodsTypeIdIsNotNull() { + addCriterion("goods_type_id is not null"); return (Criteria) this; } - public Criteria andGoodstypeidEqualTo(Integer value) { - addCriterion("goodsTypeId =", value, "goodstypeid"); + public Criteria andGoodsTypeIdEqualTo(Integer value) { + addCriterion("goods_type_id =", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidNotEqualTo(Integer value) { - addCriterion("goodsTypeId <>", value, "goodstypeid"); + public Criteria andGoodsTypeIdNotEqualTo(Integer value) { + addCriterion("goods_type_id <>", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidGreaterThan(Integer value) { - addCriterion("goodsTypeId >", value, "goodstypeid"); + public Criteria andGoodsTypeIdGreaterThan(Integer value) { + addCriterion("goods_type_id >", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidGreaterThanOrEqualTo(Integer value) { - addCriterion("goodsTypeId >=", value, "goodstypeid"); + public Criteria andGoodsTypeIdGreaterThanOrEqualTo(Integer value) { + addCriterion("goods_type_id >=", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidLessThan(Integer value) { - addCriterion("goodsTypeId <", value, "goodstypeid"); + public Criteria andGoodsTypeIdLessThan(Integer value) { + addCriterion("goods_type_id <", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidLessThanOrEqualTo(Integer value) { - addCriterion("goodsTypeId <=", value, "goodstypeid"); + public Criteria andGoodsTypeIdLessThanOrEqualTo(Integer value) { + addCriterion("goods_type_id <=", value, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidIn(List values) { - addCriterion("goodsTypeId in", values, "goodstypeid"); + public Criteria andGoodsTypeIdIn(List values) { + addCriterion("goods_type_id in", values, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidNotIn(List values) { - addCriterion("goodsTypeId not in", values, "goodstypeid"); + public Criteria andGoodsTypeIdNotIn(List values) { + addCriterion("goods_type_id not in", values, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidBetween(Integer value1, Integer value2) { - addCriterion("goodsTypeId between", value1, value2, "goodstypeid"); + public Criteria andGoodsTypeIdBetween(Integer value1, Integer value2) { + addCriterion("goods_type_id between", value1, value2, "goodsTypeId"); return (Criteria) this; } - public Criteria andGoodstypeidNotBetween(Integer value1, Integer value2) { - addCriterion("goodsTypeId not between", value1, value2, "goodstypeid"); + public Criteria andGoodsTypeIdNotBetween(Integer value1, Integer value2) { + addCriterion("goods_type_id not between", value1, value2, "goodsTypeId"); return (Criteria) this; } - public Criteria andBrandidIsNull() { - addCriterion("brandId is null"); + public Criteria andBrandIdIsNull() { + addCriterion("brand_id is null"); return (Criteria) this; } - public Criteria andBrandidIsNotNull() { - addCriterion("brandId is not null"); + public Criteria andBrandIdIsNotNull() { + addCriterion("brand_id is not null"); return (Criteria) this; } - public Criteria andBrandidEqualTo(Integer value) { - addCriterion("brandId =", value, "brandid"); + public Criteria andBrandIdEqualTo(Integer value) { + addCriterion("brand_id =", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidNotEqualTo(Integer value) { - addCriterion("brandId <>", value, "brandid"); + public Criteria andBrandIdNotEqualTo(Integer value) { + addCriterion("brand_id <>", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidGreaterThan(Integer value) { - addCriterion("brandId >", value, "brandid"); + public Criteria andBrandIdGreaterThan(Integer value) { + addCriterion("brand_id >", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidGreaterThanOrEqualTo(Integer value) { - addCriterion("brandId >=", value, "brandid"); + public Criteria andBrandIdGreaterThanOrEqualTo(Integer value) { + addCriterion("brand_id >=", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidLessThan(Integer value) { - addCriterion("brandId <", value, "brandid"); + public Criteria andBrandIdLessThan(Integer value) { + addCriterion("brand_id <", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidLessThanOrEqualTo(Integer value) { - addCriterion("brandId <=", value, "brandid"); + public Criteria andBrandIdLessThanOrEqualTo(Integer value) { + addCriterion("brand_id <=", value, "brandId"); return (Criteria) this; } - public Criteria andBrandidIn(List values) { - addCriterion("brandId in", values, "brandid"); + public Criteria andBrandIdIn(List values) { + addCriterion("brand_id in", values, "brandId"); return (Criteria) this; } - public Criteria andBrandidNotIn(List values) { - addCriterion("brandId not in", values, "brandid"); + public Criteria andBrandIdNotIn(List values) { + addCriterion("brand_id not in", values, "brandId"); return (Criteria) this; } - public Criteria andBrandidBetween(Integer value1, Integer value2) { - addCriterion("brandId between", value1, value2, "brandid"); + public Criteria andBrandIdBetween(Integer value1, Integer value2) { + addCriterion("brand_id between", value1, value2, "brandId"); return (Criteria) this; } - public Criteria andBrandidNotBetween(Integer value1, Integer value2) { - addCriterion("brandId not between", value1, value2, "brandid"); + public Criteria andBrandIdNotBetween(Integer value1, Integer value2) { + addCriterion("brand_id not between", value1, value2, "brandId"); return (Criteria) this; } }