diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordMapper.java b/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordMapper.java index 2d4aed3c..bec4ccf7 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordMapper.java @@ -3,6 +3,7 @@ package com.hai.dao; import com.hai.entity.HighCouponPackageRecord; import com.hai.entity.HighCouponPackageRecordExample; import java.util.List; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.DeleteProvider; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.InsertProvider; @@ -10,7 +11,9 @@ import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.UpdateProvider; import org.apache.ibatis.type.JdbcType; import org.springframework.stereotype.Repository; @@ -29,22 +32,26 @@ public interface HighCouponPackageRecordMapper extends HighCouponPackageRecordMa @DeleteProvider(type=HighCouponPackageRecordSqlProvider.class, method="deleteByExample") int deleteByExample(HighCouponPackageRecordExample example); + @Delete({ + "delete from high_coupon_package_record", + "where id = #{id,jdbcType=INTEGER}" + }) + int deleteByPrimaryKey(Integer id); + @Insert({ "insert into high_coupon_package_record (coupon_package_title, coupon_package_id, ", - "goods_type_name, brand_name, ", + "using_attribution, company_id, ", "order_id, child_order_id, ", - "price, order_no, ", - "sales_type, created_user_id, ", - "created_time, updated_user_id, ", - "updated_time, `status`, ", + "price, record_no, ", + "sales_type, user_id, ", + "created_time, `status`, ", "ext_1, ext_2, ext_3)", "values (#{couponPackageTitle,jdbcType=VARCHAR}, #{couponPackageId,jdbcType=INTEGER}, ", - "#{goodsTypeName,jdbcType=VARCHAR}, #{brandName,jdbcType=VARCHAR}, ", + "#{usingAttribution,jdbcType=INTEGER}, #{companyId,jdbcType=INTEGER}, ", "#{orderId,jdbcType=INTEGER}, #{childOrderId,jdbcType=INTEGER}, ", - "#{price,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, ", - "#{salesType,jdbcType=INTEGER}, #{createdUserId,jdbcType=INTEGER}, ", - "#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=INTEGER}, ", - "#{updatedTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", + "#{price,jdbcType=DECIMAL}, #{recordNo,jdbcType=VARCHAR}, ", + "#{salesType,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, ", + "#{createdTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") @@ -56,20 +63,18 @@ public interface HighCouponPackageRecordMapper extends HighCouponPackageRecordMa @SelectProvider(type=HighCouponPackageRecordSqlProvider.class, method="selectByExample") @Results({ - @Result(column="id", property="id", jdbcType=JdbcType.INTEGER), + @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), @Result(column="coupon_package_title", property="couponPackageTitle", jdbcType=JdbcType.VARCHAR), @Result(column="coupon_package_id", property="couponPackageId", jdbcType=JdbcType.INTEGER), - @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR), - @Result(column="brand_name", property="brandName", jdbcType=JdbcType.VARCHAR), + @Result(column="using_attribution", property="usingAttribution", jdbcType=JdbcType.INTEGER), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), @Result(column="order_id", property="orderId", jdbcType=JdbcType.INTEGER), @Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.INTEGER), @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), - @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="record_no", property="recordNo", jdbcType=JdbcType.VARCHAR), @Result(column="sales_type", property="salesType", jdbcType=JdbcType.INTEGER), - @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER), + @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER), @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="updated_user_id", property="updatedUserId", jdbcType=JdbcType.INTEGER), - @Result(column="updated_time", property="updatedTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -77,9 +82,61 @@ public interface HighCouponPackageRecordMapper extends HighCouponPackageRecordMa }) List selectByExample(HighCouponPackageRecordExample example); + @Select({ + "select", + "id, coupon_package_title, coupon_package_id, using_attribution, company_id, ", + "order_id, child_order_id, price, record_no, sales_type, user_id, created_time, ", + "`status`, ext_1, ext_2, ext_3", + "from high_coupon_package_record", + "where id = #{id,jdbcType=INTEGER}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true), + @Result(column="coupon_package_title", property="couponPackageTitle", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_package_id", property="couponPackageId", jdbcType=JdbcType.INTEGER), + @Result(column="using_attribution", property="usingAttribution", jdbcType=JdbcType.INTEGER), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.INTEGER), + @Result(column="order_id", property="orderId", jdbcType=JdbcType.INTEGER), + @Result(column="child_order_id", property="childOrderId", jdbcType=JdbcType.INTEGER), + @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL), + @Result(column="record_no", property="recordNo", jdbcType=JdbcType.VARCHAR), + @Result(column="sales_type", property="salesType", jdbcType=JdbcType.INTEGER), + @Result(column="user_id", property="userId", jdbcType=JdbcType.INTEGER), + @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + HighCouponPackageRecord selectByPrimaryKey(Integer id); + @UpdateProvider(type=HighCouponPackageRecordSqlProvider.class, method="updateByExampleSelective") int updateByExampleSelective(@Param("record") HighCouponPackageRecord record, @Param("example") HighCouponPackageRecordExample example); @UpdateProvider(type=HighCouponPackageRecordSqlProvider.class, method="updateByExample") int updateByExample(@Param("record") HighCouponPackageRecord record, @Param("example") HighCouponPackageRecordExample example); + + @UpdateProvider(type=HighCouponPackageRecordSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighCouponPackageRecord record); + + @Update({ + "update high_coupon_package_record", + "set coupon_package_title = #{couponPackageTitle,jdbcType=VARCHAR},", + "coupon_package_id = #{couponPackageId,jdbcType=INTEGER},", + "using_attribution = #{usingAttribution,jdbcType=INTEGER},", + "company_id = #{companyId,jdbcType=INTEGER},", + "order_id = #{orderId,jdbcType=INTEGER},", + "child_order_id = #{childOrderId,jdbcType=INTEGER},", + "price = #{price,jdbcType=DECIMAL},", + "record_no = #{recordNo,jdbcType=VARCHAR},", + "sales_type = #{salesType,jdbcType=INTEGER},", + "user_id = #{userId,jdbcType=INTEGER},", + "created_time = #{createdTime,jdbcType=TIMESTAMP},", + "`status` = #{status,jdbcType=INTEGER},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=INTEGER}" + }) + int updateByPrimaryKey(HighCouponPackageRecord record); } \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordSqlProvider.java index 649104c3..28306873 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponPackageRecordSqlProvider.java @@ -36,12 +36,12 @@ public class HighCouponPackageRecordSqlProvider { sql.VALUES("coupon_package_id", "#{couponPackageId,jdbcType=INTEGER}"); } - if (record.getGoodsTypeName() != null) { - sql.VALUES("goods_type_name", "#{goodsTypeName,jdbcType=VARCHAR}"); + if (record.getUsingAttribution() != null) { + sql.VALUES("using_attribution", "#{usingAttribution,jdbcType=INTEGER}"); } - if (record.getBrandName() != null) { - sql.VALUES("brand_name", "#{brandName,jdbcType=VARCHAR}"); + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=INTEGER}"); } if (record.getOrderId() != null) { @@ -56,30 +56,22 @@ public class HighCouponPackageRecordSqlProvider { sql.VALUES("price", "#{price,jdbcType=DECIMAL}"); } - if (record.getOrderNo() != null) { - sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); + if (record.getRecordNo() != null) { + sql.VALUES("record_no", "#{recordNo,jdbcType=VARCHAR}"); } if (record.getSalesType() != null) { sql.VALUES("sales_type", "#{salesType,jdbcType=INTEGER}"); } - if (record.getCreatedUserId() != null) { - sql.VALUES("created_user_id", "#{createdUserId,jdbcType=INTEGER}"); + if (record.getUserId() != null) { + sql.VALUES("user_id", "#{userId,jdbcType=INTEGER}"); } if (record.getCreatedTime() != null) { sql.VALUES("created_time", "#{createdTime,jdbcType=TIMESTAMP}"); } - if (record.getUpdatedUserId() != null) { - sql.VALUES("updated_user_id", "#{updatedUserId,jdbcType=INTEGER}"); - } - - if (record.getUpdatedTime() != null) { - sql.VALUES("updated_time", "#{updatedTime,jdbcType=TIMESTAMP}"); - } - if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -108,17 +100,15 @@ public class HighCouponPackageRecordSqlProvider { } sql.SELECT("coupon_package_title"); sql.SELECT("coupon_package_id"); - sql.SELECT("goods_type_name"); - sql.SELECT("brand_name"); + sql.SELECT("using_attribution"); + sql.SELECT("company_id"); sql.SELECT("order_id"); sql.SELECT("child_order_id"); sql.SELECT("price"); - sql.SELECT("order_no"); + sql.SELECT("record_no"); sql.SELECT("sales_type"); - sql.SELECT("created_user_id"); + sql.SELECT("user_id"); sql.SELECT("created_time"); - sql.SELECT("updated_user_id"); - sql.SELECT("updated_time"); sql.SELECT("`status`"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); @@ -152,12 +142,12 @@ public class HighCouponPackageRecordSqlProvider { sql.SET("coupon_package_id = #{record.couponPackageId,jdbcType=INTEGER}"); } - if (record.getGoodsTypeName() != null) { - sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}"); + if (record.getUsingAttribution() != null) { + sql.SET("using_attribution = #{record.usingAttribution,jdbcType=INTEGER}"); } - if (record.getBrandName() != null) { - sql.SET("brand_name = #{record.brandName,jdbcType=VARCHAR}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}"); } if (record.getOrderId() != null) { @@ -172,30 +162,22 @@ public class HighCouponPackageRecordSqlProvider { sql.SET("price = #{record.price,jdbcType=DECIMAL}"); } - if (record.getOrderNo() != null) { - sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + if (record.getRecordNo() != null) { + sql.SET("record_no = #{record.recordNo,jdbcType=VARCHAR}"); } if (record.getSalesType() != null) { sql.SET("sales_type = #{record.salesType,jdbcType=INTEGER}"); } - if (record.getCreatedUserId() != null) { - sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}"); + if (record.getUserId() != null) { + sql.SET("user_id = #{record.userId,jdbcType=INTEGER}"); } if (record.getCreatedTime() != null) { sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); } - if (record.getUpdatedUserId() != null) { - sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=INTEGER}"); - } - - if (record.getUpdatedTime() != null) { - sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); - } - if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -223,17 +205,15 @@ public class HighCouponPackageRecordSqlProvider { sql.SET("id = #{record.id,jdbcType=INTEGER}"); sql.SET("coupon_package_title = #{record.couponPackageTitle,jdbcType=VARCHAR}"); sql.SET("coupon_package_id = #{record.couponPackageId,jdbcType=INTEGER}"); - sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}"); - sql.SET("brand_name = #{record.brandName,jdbcType=VARCHAR}"); + sql.SET("using_attribution = #{record.usingAttribution,jdbcType=INTEGER}"); + sql.SET("company_id = #{record.companyId,jdbcType=INTEGER}"); sql.SET("order_id = #{record.orderId,jdbcType=INTEGER}"); sql.SET("child_order_id = #{record.childOrderId,jdbcType=INTEGER}"); sql.SET("price = #{record.price,jdbcType=DECIMAL}"); - sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); + sql.SET("record_no = #{record.recordNo,jdbcType=VARCHAR}"); sql.SET("sales_type = #{record.salesType,jdbcType=INTEGER}"); - sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}"); + sql.SET("user_id = #{record.userId,jdbcType=INTEGER}"); sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); - sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=INTEGER}"); - sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); @@ -244,6 +224,75 @@ public class HighCouponPackageRecordSqlProvider { return sql.toString(); } + public String updateByPrimaryKeySelective(HighCouponPackageRecord record) { + SQL sql = new SQL(); + sql.UPDATE("high_coupon_package_record"); + + if (record.getCouponPackageTitle() != null) { + sql.SET("coupon_package_title = #{couponPackageTitle,jdbcType=VARCHAR}"); + } + + if (record.getCouponPackageId() != null) { + sql.SET("coupon_package_id = #{couponPackageId,jdbcType=INTEGER}"); + } + + if (record.getUsingAttribution() != null) { + sql.SET("using_attribution = #{usingAttribution,jdbcType=INTEGER}"); + } + + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=INTEGER}"); + } + + if (record.getOrderId() != null) { + sql.SET("order_id = #{orderId,jdbcType=INTEGER}"); + } + + if (record.getChildOrderId() != null) { + sql.SET("child_order_id = #{childOrderId,jdbcType=INTEGER}"); + } + + if (record.getPrice() != null) { + sql.SET("price = #{price,jdbcType=DECIMAL}"); + } + + if (record.getRecordNo() != null) { + sql.SET("record_no = #{recordNo,jdbcType=VARCHAR}"); + } + + if (record.getSalesType() != null) { + sql.SET("sales_type = #{salesType,jdbcType=INTEGER}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{userId,jdbcType=INTEGER}"); + } + + if (record.getCreatedTime() != null) { + sql.SET("created_time = #{createdTime,jdbcType=TIMESTAMP}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=INTEGER}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=INTEGER}"); + + return sql.toString(); + } + protected void applyWhere(SQL sql, HighCouponPackageRecordExample example, boolean includeExamplePhrase) { if (example == null) { return; diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecord.java b/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecord.java index dbfe660e..addb9068 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecord.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecord.java @@ -30,14 +30,14 @@ public class HighCouponPackageRecord implements Serializable { private Integer couponPackageId; /** - * 商品分类名称 + * 使用归属 */ - private String goodsTypeName; + private Integer usingAttribution; /** - * 品牌分类名称 + * 公司id */ - private String brandName; + private Integer companyId; /** * 支付订单id @@ -55,35 +55,25 @@ public class HighCouponPackageRecord implements Serializable { private BigDecimal price; /** - * 订单号 + * 赠送记录号 */ - private String orderNo; + private String recordNo; /** - * 销售类型 + * 销售类型 :1 售卖 2: 赠送 */ private Integer salesType; /** - * 创建人 + * 用户id */ - private Integer createdUserId; + private Integer userId; /** * 创建时间 */ private Date createdTime; - /** - * 更新人 - */ - private Integer updatedUserId; - - /** - * 更新时间 - */ - private Date updatedTime; - /** * 状态 1:正常 0 : 删除 */ @@ -130,20 +120,20 @@ public class HighCouponPackageRecord implements Serializable { this.couponPackageId = couponPackageId; } - public String getGoodsTypeName() { - return goodsTypeName; + public Integer getUsingAttribution() { + return usingAttribution; } - public void setGoodsTypeName(String goodsTypeName) { - this.goodsTypeName = goodsTypeName; + public void setUsingAttribution(Integer usingAttribution) { + this.usingAttribution = usingAttribution; } - public String getBrandName() { - return brandName; + public Integer getCompanyId() { + return companyId; } - public void setBrandName(String brandName) { - this.brandName = brandName; + public void setCompanyId(Integer companyId) { + this.companyId = companyId; } public Integer getOrderId() { @@ -170,12 +160,12 @@ public class HighCouponPackageRecord implements Serializable { this.price = price; } - public String getOrderNo() { - return orderNo; + public String getRecordNo() { + return recordNo; } - public void setOrderNo(String orderNo) { - this.orderNo = orderNo; + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; } public Integer getSalesType() { @@ -186,12 +176,12 @@ public class HighCouponPackageRecord implements Serializable { this.salesType = salesType; } - public Integer getCreatedUserId() { - return createdUserId; + public Integer getUserId() { + return userId; } - public void setCreatedUserId(Integer createdUserId) { - this.createdUserId = createdUserId; + public void setUserId(Integer userId) { + this.userId = userId; } public Date getCreatedTime() { @@ -202,22 +192,6 @@ public class HighCouponPackageRecord implements Serializable { this.createdTime = createdTime; } - public Integer getUpdatedUserId() { - return updatedUserId; - } - - public void setUpdatedUserId(Integer updatedUserId) { - this.updatedUserId = updatedUserId; - } - - public Date getUpdatedTime() { - return updatedTime; - } - - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; - } - public Integer getStatus() { return status; } @@ -265,17 +239,15 @@ public class HighCouponPackageRecord implements Serializable { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getCouponPackageTitle() == null ? other.getCouponPackageTitle() == null : this.getCouponPackageTitle().equals(other.getCouponPackageTitle())) && (this.getCouponPackageId() == null ? other.getCouponPackageId() == null : this.getCouponPackageId().equals(other.getCouponPackageId())) - && (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName())) - && (this.getBrandName() == null ? other.getBrandName() == null : this.getBrandName().equals(other.getBrandName())) + && (this.getUsingAttribution() == null ? other.getUsingAttribution() == null : this.getUsingAttribution().equals(other.getUsingAttribution())) + && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) && (this.getChildOrderId() == null ? other.getChildOrderId() == null : this.getChildOrderId().equals(other.getChildOrderId())) && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) - && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) + && (this.getRecordNo() == null ? other.getRecordNo() == null : this.getRecordNo().equals(other.getRecordNo())) && (this.getSalesType() == null ? other.getSalesType() == null : this.getSalesType().equals(other.getSalesType())) - && (this.getCreatedUserId() == null ? other.getCreatedUserId() == null : this.getCreatedUserId().equals(other.getCreatedUserId())) + && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getCreatedTime() == null ? other.getCreatedTime() == null : this.getCreatedTime().equals(other.getCreatedTime())) - && (this.getUpdatedUserId() == null ? other.getUpdatedUserId() == null : this.getUpdatedUserId().equals(other.getUpdatedUserId())) - && (this.getUpdatedTime() == null ? other.getUpdatedTime() == null : this.getUpdatedTime().equals(other.getUpdatedTime())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) @@ -289,17 +261,15 @@ public class HighCouponPackageRecord implements Serializable { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getCouponPackageTitle() == null) ? 0 : getCouponPackageTitle().hashCode()); result = prime * result + ((getCouponPackageId() == null) ? 0 : getCouponPackageId().hashCode()); - result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode()); - result = prime * result + ((getBrandName() == null) ? 0 : getBrandName().hashCode()); + result = prime * result + ((getUsingAttribution() == null) ? 0 : getUsingAttribution().hashCode()); + result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); result = prime * result + ((getChildOrderId() == null) ? 0 : getChildOrderId().hashCode()); result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); - result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); + result = prime * result + ((getRecordNo() == null) ? 0 : getRecordNo().hashCode()); result = prime * result + ((getSalesType() == null) ? 0 : getSalesType().hashCode()); - result = prime * result + ((getCreatedUserId() == null) ? 0 : getCreatedUserId().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode()); - result = prime * result + ((getUpdatedUserId() == null) ? 0 : getUpdatedUserId().hashCode()); - result = prime * result + ((getUpdatedTime() == null) ? 0 : getUpdatedTime().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); @@ -316,17 +286,15 @@ public class HighCouponPackageRecord implements Serializable { sb.append(", id=").append(id); sb.append(", couponPackageTitle=").append(couponPackageTitle); sb.append(", couponPackageId=").append(couponPackageId); - sb.append(", goodsTypeName=").append(goodsTypeName); - sb.append(", brandName=").append(brandName); + sb.append(", usingAttribution=").append(usingAttribution); + sb.append(", companyId=").append(companyId); sb.append(", orderId=").append(orderId); sb.append(", childOrderId=").append(childOrderId); sb.append(", price=").append(price); - sb.append(", orderNo=").append(orderNo); + sb.append(", recordNo=").append(recordNo); sb.append(", salesType=").append(salesType); - sb.append(", createdUserId=").append(createdUserId); + sb.append(", userId=").append(userId); sb.append(", createdTime=").append(createdTime); - sb.append(", updatedUserId=").append(updatedUserId); - sb.append(", updatedTime=").append(updatedTime); sb.append(", status=").append(status); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecordExample.java b/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecordExample.java index 60adc198..5950dd01 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecordExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponPackageRecordExample.java @@ -316,143 +316,123 @@ public class HighCouponPackageRecordExample { return (Criteria) this; } - public Criteria andGoodsTypeNameIsNull() { - addCriterion("goods_type_name is null"); + public Criteria andUsingAttributionIsNull() { + addCriterion("using_attribution is null"); return (Criteria) this; } - public Criteria andGoodsTypeNameIsNotNull() { - addCriterion("goods_type_name is not null"); + public Criteria andUsingAttributionIsNotNull() { + addCriterion("using_attribution is not null"); return (Criteria) this; } - public Criteria andGoodsTypeNameEqualTo(String value) { - addCriterion("goods_type_name =", value, "goodsTypeName"); + public Criteria andUsingAttributionEqualTo(Integer value) { + addCriterion("using_attribution =", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameNotEqualTo(String value) { - addCriterion("goods_type_name <>", value, "goodsTypeName"); + public Criteria andUsingAttributionNotEqualTo(Integer value) { + addCriterion("using_attribution <>", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameGreaterThan(String value) { - addCriterion("goods_type_name >", value, "goodsTypeName"); + public Criteria andUsingAttributionGreaterThan(Integer value) { + addCriterion("using_attribution >", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameGreaterThanOrEqualTo(String value) { - addCriterion("goods_type_name >=", value, "goodsTypeName"); + public Criteria andUsingAttributionGreaterThanOrEqualTo(Integer value) { + addCriterion("using_attribution >=", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameLessThan(String value) { - addCriterion("goods_type_name <", value, "goodsTypeName"); + public Criteria andUsingAttributionLessThan(Integer value) { + addCriterion("using_attribution <", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameLessThanOrEqualTo(String value) { - addCriterion("goods_type_name <=", value, "goodsTypeName"); + public Criteria andUsingAttributionLessThanOrEqualTo(Integer value) { + addCriterion("using_attribution <=", value, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameLike(String value) { - addCriterion("goods_type_name like", value, "goodsTypeName"); + public Criteria andUsingAttributionIn(List values) { + addCriterion("using_attribution in", values, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameNotLike(String value) { - addCriterion("goods_type_name not like", value, "goodsTypeName"); + public Criteria andUsingAttributionNotIn(List values) { + addCriterion("using_attribution not in", values, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameIn(List values) { - addCriterion("goods_type_name in", values, "goodsTypeName"); + public Criteria andUsingAttributionBetween(Integer value1, Integer value2) { + addCriterion("using_attribution between", value1, value2, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameNotIn(List values) { - addCriterion("goods_type_name not in", values, "goodsTypeName"); + public Criteria andUsingAttributionNotBetween(Integer value1, Integer value2) { + addCriterion("using_attribution not between", value1, value2, "usingAttribution"); return (Criteria) this; } - public Criteria andGoodsTypeNameBetween(String value1, String value2) { - addCriterion("goods_type_name between", value1, value2, "goodsTypeName"); + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); return (Criteria) this; } - public Criteria andGoodsTypeNameNotBetween(String value1, String value2) { - addCriterion("goods_type_name not between", value1, value2, "goodsTypeName"); + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); return (Criteria) this; } - public Criteria andBrandNameIsNull() { - addCriterion("brand_name is null"); + public Criteria andCompanyIdEqualTo(Integer value) { + addCriterion("company_id =", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameIsNotNull() { - addCriterion("brand_name is not null"); + public Criteria andCompanyIdNotEqualTo(Integer value) { + addCriterion("company_id <>", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameEqualTo(String value) { - addCriterion("brand_name =", value, "brandName"); + public Criteria andCompanyIdGreaterThan(Integer value) { + addCriterion("company_id >", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameNotEqualTo(String value) { - addCriterion("brand_name <>", value, "brandName"); + public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) { + addCriterion("company_id >=", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameGreaterThan(String value) { - addCriterion("brand_name >", value, "brandName"); + public Criteria andCompanyIdLessThan(Integer value) { + addCriterion("company_id <", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameGreaterThanOrEqualTo(String value) { - addCriterion("brand_name >=", value, "brandName"); + public Criteria andCompanyIdLessThanOrEqualTo(Integer value) { + addCriterion("company_id <=", value, "companyId"); return (Criteria) this; } - public Criteria andBrandNameLessThan(String value) { - addCriterion("brand_name <", value, "brandName"); + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); return (Criteria) this; } - public Criteria andBrandNameLessThanOrEqualTo(String value) { - addCriterion("brand_name <=", value, "brandName"); + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); return (Criteria) this; } - public Criteria andBrandNameLike(String value) { - addCriterion("brand_name like", value, "brandName"); + public Criteria andCompanyIdBetween(Integer value1, Integer value2) { + addCriterion("company_id between", value1, value2, "companyId"); return (Criteria) this; } - public Criteria andBrandNameNotLike(String value) { - addCriterion("brand_name not like", value, "brandName"); - return (Criteria) this; - } - - public Criteria andBrandNameIn(List values) { - addCriterion("brand_name in", values, "brandName"); - return (Criteria) this; - } - - public Criteria andBrandNameNotIn(List values) { - addCriterion("brand_name not in", values, "brandName"); - return (Criteria) this; - } - - public Criteria andBrandNameBetween(String value1, String value2) { - addCriterion("brand_name between", value1, value2, "brandName"); - return (Criteria) this; - } - - public Criteria andBrandNameNotBetween(String value1, String value2) { - addCriterion("brand_name not between", value1, value2, "brandName"); + public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) { + addCriterion("company_id not between", value1, value2, "companyId"); return (Criteria) this; } @@ -636,73 +616,73 @@ public class HighCouponPackageRecordExample { return (Criteria) this; } - public Criteria andOrderNoIsNull() { - addCriterion("order_no is null"); + public Criteria andRecordNoIsNull() { + addCriterion("record_no is null"); return (Criteria) this; } - public Criteria andOrderNoIsNotNull() { - addCriterion("order_no is not null"); + public Criteria andRecordNoIsNotNull() { + addCriterion("record_no is not null"); return (Criteria) this; } - public Criteria andOrderNoEqualTo(String value) { - addCriterion("order_no =", value, "orderNo"); + public Criteria andRecordNoEqualTo(String value) { + addCriterion("record_no =", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoNotEqualTo(String value) { - addCriterion("order_no <>", value, "orderNo"); + public Criteria andRecordNoNotEqualTo(String value) { + addCriterion("record_no <>", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoGreaterThan(String value) { - addCriterion("order_no >", value, "orderNo"); + public Criteria andRecordNoGreaterThan(String value) { + addCriterion("record_no >", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoGreaterThanOrEqualTo(String value) { - addCriterion("order_no >=", value, "orderNo"); + public Criteria andRecordNoGreaterThanOrEqualTo(String value) { + addCriterion("record_no >=", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoLessThan(String value) { - addCriterion("order_no <", value, "orderNo"); + public Criteria andRecordNoLessThan(String value) { + addCriterion("record_no <", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoLessThanOrEqualTo(String value) { - addCriterion("order_no <=", value, "orderNo"); + public Criteria andRecordNoLessThanOrEqualTo(String value) { + addCriterion("record_no <=", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoLike(String value) { - addCriterion("order_no like", value, "orderNo"); + public Criteria andRecordNoLike(String value) { + addCriterion("record_no like", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoNotLike(String value) { - addCriterion("order_no not like", value, "orderNo"); + public Criteria andRecordNoNotLike(String value) { + addCriterion("record_no not like", value, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoIn(List values) { - addCriterion("order_no in", values, "orderNo"); + public Criteria andRecordNoIn(List values) { + addCriterion("record_no in", values, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoNotIn(List values) { - addCriterion("order_no not in", values, "orderNo"); + public Criteria andRecordNoNotIn(List values) { + addCriterion("record_no not in", values, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoBetween(String value1, String value2) { - addCriterion("order_no between", value1, value2, "orderNo"); + public Criteria andRecordNoBetween(String value1, String value2) { + addCriterion("record_no between", value1, value2, "recordNo"); return (Criteria) this; } - public Criteria andOrderNoNotBetween(String value1, String value2) { - addCriterion("order_no not between", value1, value2, "orderNo"); + public Criteria andRecordNoNotBetween(String value1, String value2) { + addCriterion("record_no not between", value1, value2, "recordNo"); return (Criteria) this; } @@ -766,63 +746,63 @@ public class HighCouponPackageRecordExample { return (Criteria) this; } - public Criteria andCreatedUserIdIsNull() { - addCriterion("created_user_id is null"); + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); return (Criteria) this; } - public Criteria andCreatedUserIdIsNotNull() { - addCriterion("created_user_id is not null"); + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); return (Criteria) this; } - public Criteria andCreatedUserIdEqualTo(Integer value) { - addCriterion("created_user_id =", value, "createdUserId"); + public Criteria andUserIdEqualTo(Integer value) { + addCriterion("user_id =", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdNotEqualTo(Integer value) { - addCriterion("created_user_id <>", value, "createdUserId"); + public Criteria andUserIdNotEqualTo(Integer value) { + addCriterion("user_id <>", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdGreaterThan(Integer value) { - addCriterion("created_user_id >", value, "createdUserId"); + public Criteria andUserIdGreaterThan(Integer value) { + addCriterion("user_id >", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdGreaterThanOrEqualTo(Integer value) { - addCriterion("created_user_id >=", value, "createdUserId"); + public Criteria andUserIdGreaterThanOrEqualTo(Integer value) { + addCriterion("user_id >=", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdLessThan(Integer value) { - addCriterion("created_user_id <", value, "createdUserId"); + public Criteria andUserIdLessThan(Integer value) { + addCriterion("user_id <", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdLessThanOrEqualTo(Integer value) { - addCriterion("created_user_id <=", value, "createdUserId"); + public Criteria andUserIdLessThanOrEqualTo(Integer value) { + addCriterion("user_id <=", value, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdIn(List values) { - addCriterion("created_user_id in", values, "createdUserId"); + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdNotIn(List values) { - addCriterion("created_user_id not in", values, "createdUserId"); + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdBetween(Integer value1, Integer value2) { - addCriterion("created_user_id between", value1, value2, "createdUserId"); + public Criteria andUserIdBetween(Integer value1, Integer value2) { + addCriterion("user_id between", value1, value2, "userId"); return (Criteria) this; } - public Criteria andCreatedUserIdNotBetween(Integer value1, Integer value2) { - addCriterion("created_user_id not between", value1, value2, "createdUserId"); + public Criteria andUserIdNotBetween(Integer value1, Integer value2) { + addCriterion("user_id not between", value1, value2, "userId"); return (Criteria) this; } @@ -886,126 +866,6 @@ public class HighCouponPackageRecordExample { return (Criteria) this; } - public Criteria andUpdatedUserIdIsNull() { - addCriterion("updated_user_id is null"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdIsNotNull() { - addCriterion("updated_user_id is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdEqualTo(Integer value) { - addCriterion("updated_user_id =", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotEqualTo(Integer value) { - addCriterion("updated_user_id <>", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdGreaterThan(Integer value) { - addCriterion("updated_user_id >", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdGreaterThanOrEqualTo(Integer value) { - addCriterion("updated_user_id >=", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdLessThan(Integer value) { - addCriterion("updated_user_id <", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdLessThanOrEqualTo(Integer value) { - addCriterion("updated_user_id <=", value, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdIn(List values) { - addCriterion("updated_user_id in", values, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotIn(List values) { - addCriterion("updated_user_id not in", values, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdBetween(Integer value1, Integer value2) { - addCriterion("updated_user_id between", value1, value2, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedUserIdNotBetween(Integer value1, Integer value2) { - addCriterion("updated_user_id not between", value1, value2, "updatedUserId"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIsNull() { - addCriterion("updated_time is null"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIsNotNull() { - addCriterion("updated_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeEqualTo(Date value) { - addCriterion("updated_time =", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotEqualTo(Date value) { - addCriterion("updated_time <>", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeGreaterThan(Date value) { - addCriterion("updated_time >", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeGreaterThanOrEqualTo(Date value) { - addCriterion("updated_time >=", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeLessThan(Date value) { - addCriterion("updated_time <", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeLessThanOrEqualTo(Date value) { - addCriterion("updated_time <=", value, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeIn(List values) { - addCriterion("updated_time in", values, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotIn(List values) { - addCriterion("updated_time not in", values, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeBetween(Date value1, Date value2) { - addCriterion("updated_time between", value1, value2, "updatedTime"); - return (Criteria) this; - } - - public Criteria andUpdatedTimeNotBetween(Date value1, Date value2) { - addCriterion("updated_time not between", value1, value2, "updatedTime"); - return (Criteria) this; - } - public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;