diff --git a/hai-service/src/main/java/com/hai/dao/BsDistributionRebateMapper.java b/hai-service/src/main/java/com/hai/dao/BsDistributionRebateMapper.java index fe27b432..b23a592e 100644 --- a/hai-service/src/main/java/com/hai/dao/BsDistributionRebateMapper.java +++ b/hai-service/src/main/java/com/hai/dao/BsDistributionRebateMapper.java @@ -39,16 +39,16 @@ public interface BsDistributionRebateMapper extends BsDistributionRebateMapperEx int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_distribution_rebate (title, order_no, ", - "agent_id, popularize_user_id, ", - "second_popularize_user_id, user_id, ", + "insert into bs_distribution_rebate (title, `type`, ", + "order_no, agent_id, ", + "popularize_user_id, user_id, ", "user_name, integral_num, ", "create_time, update_time, ", "`status`, ext_1, ext_2, ", "ext_3)", - "values (#{title,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", - "#{agentId,jdbcType=BIGINT}, #{popularizeUserId,jdbcType=BIGINT}, ", - "#{secondPopularizeUserId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, ", + "values (#{title,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, ", + "#{orderNo,jdbcType=VARCHAR}, #{agentId,jdbcType=BIGINT}, ", + "#{popularizeUserId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, ", "#{userName,jdbcType=VARCHAR}, #{integralNum,jdbcType=DECIMAL}, ", "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", @@ -65,10 +65,10 @@ public interface BsDistributionRebateMapper extends BsDistributionRebateMapperEx @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), @Result(column="popularize_user_id", property="popularizeUserId", jdbcType=JdbcType.BIGINT), - @Result(column="second_popularize_user_id", property="secondPopularizeUserId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @@ -83,19 +83,18 @@ public interface BsDistributionRebateMapper extends BsDistributionRebateMapperEx @Select({ "select", - "id, title, order_no, agent_id, popularize_user_id, second_popularize_user_id, ", - "user_id, user_name, integral_num, create_time, update_time, `status`, ext_1, ", - "ext_2, ext_3", + "id, title, `type`, order_no, agent_id, popularize_user_id, user_id, user_name, ", + "integral_num, create_time, update_time, `status`, ext_1, ext_2, ext_3", "from bs_distribution_rebate", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), @Result(column="popularize_user_id", property="popularizeUserId", jdbcType=JdbcType.BIGINT), - @Result(column="second_popularize_user_id", property="secondPopularizeUserId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @@ -120,10 +119,10 @@ public interface BsDistributionRebateMapper extends BsDistributionRebateMapperEx @Update({ "update bs_distribution_rebate", "set title = #{title,jdbcType=VARCHAR},", + "`type` = #{type,jdbcType=INTEGER},", "order_no = #{orderNo,jdbcType=VARCHAR},", "agent_id = #{agentId,jdbcType=BIGINT},", "popularize_user_id = #{popularizeUserId,jdbcType=BIGINT},", - "second_popularize_user_id = #{secondPopularizeUserId,jdbcType=BIGINT},", "user_id = #{userId,jdbcType=BIGINT},", "user_name = #{userName,jdbcType=VARCHAR},", "integral_num = #{integralNum,jdbcType=DECIMAL},", diff --git a/hai-service/src/main/java/com/hai/dao/BsDistributionRebateSqlProvider.java b/hai-service/src/main/java/com/hai/dao/BsDistributionRebateSqlProvider.java index 384b9717..df96acf4 100644 --- a/hai-service/src/main/java/com/hai/dao/BsDistributionRebateSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/BsDistributionRebateSqlProvider.java @@ -32,6 +32,10 @@ public class BsDistributionRebateSqlProvider { sql.VALUES("title", "#{title,jdbcType=VARCHAR}"); } + if (record.getType() != null) { + sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } @@ -44,10 +48,6 @@ public class BsDistributionRebateSqlProvider { sql.VALUES("popularize_user_id", "#{popularizeUserId,jdbcType=BIGINT}"); } - if (record.getSecondPopularizeUserId() != null) { - sql.VALUES("second_popularize_user_id", "#{secondPopularizeUserId,jdbcType=BIGINT}"); - } - if (record.getUserId() != null) { sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); } @@ -95,10 +95,10 @@ public class BsDistributionRebateSqlProvider { sql.SELECT("id"); } sql.SELECT("title"); + sql.SELECT("`type`"); sql.SELECT("order_no"); sql.SELECT("agent_id"); sql.SELECT("popularize_user_id"); - sql.SELECT("second_popularize_user_id"); sql.SELECT("user_id"); sql.SELECT("user_name"); sql.SELECT("integral_num"); @@ -133,6 +133,10 @@ public class BsDistributionRebateSqlProvider { sql.SET("title = #{record.title,jdbcType=VARCHAR}"); } + if (record.getType() != null) { + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } @@ -145,10 +149,6 @@ public class BsDistributionRebateSqlProvider { sql.SET("popularize_user_id = #{record.popularizeUserId,jdbcType=BIGINT}"); } - if (record.getSecondPopularizeUserId() != null) { - sql.SET("second_popularize_user_id = #{record.secondPopularizeUserId,jdbcType=BIGINT}"); - } - if (record.getUserId() != null) { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); } @@ -195,10 +195,10 @@ public class BsDistributionRebateSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("title = #{record.title,jdbcType=VARCHAR}"); + sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}"); sql.SET("popularize_user_id = #{record.popularizeUserId,jdbcType=BIGINT}"); - sql.SET("second_popularize_user_id = #{record.secondPopularizeUserId,jdbcType=BIGINT}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); sql.SET("integral_num = #{record.integralNum,jdbcType=DECIMAL}"); @@ -222,6 +222,10 @@ public class BsDistributionRebateSqlProvider { sql.SET("title = #{title,jdbcType=VARCHAR}"); } + if (record.getType() != null) { + sql.SET("`type` = #{type,jdbcType=INTEGER}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } @@ -234,10 +238,6 @@ public class BsDistributionRebateSqlProvider { sql.SET("popularize_user_id = #{popularizeUserId,jdbcType=BIGINT}"); } - if (record.getSecondPopularizeUserId() != null) { - sql.SET("second_popularize_user_id = #{secondPopularizeUserId,jdbcType=BIGINT}"); - } - if (record.getUserId() != null) { sql.SET("user_id = #{userId,jdbcType=BIGINT}"); } diff --git a/hai-service/src/main/java/com/hai/entity/BsDistributionRebate.java b/hai-service/src/main/java/com/hai/entity/BsDistributionRebate.java index 66f5bc49..4024cdcd 100644 --- a/hai-service/src/main/java/com/hai/entity/BsDistributionRebate.java +++ b/hai-service/src/main/java/com/hai/entity/BsDistributionRebate.java @@ -24,6 +24,11 @@ public class BsDistributionRebate implements Serializable { */ private String title; + /** + * 类型 1:上级推广人 2:顶级推广人 + */ + private Integer type; + /** * 订单号 */ @@ -39,11 +44,6 @@ public class BsDistributionRebate implements Serializable { */ private Long popularizeUserId; - /** - * 二级推广人员 - */ - private Long secondPopularizeUserId; - /** * 人员ID */ @@ -107,6 +107,14 @@ public class BsDistributionRebate implements Serializable { this.title = title; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getOrderNo() { return orderNo; } @@ -131,14 +139,6 @@ public class BsDistributionRebate implements Serializable { this.popularizeUserId = popularizeUserId; } - public Long getSecondPopularizeUserId() { - return secondPopularizeUserId; - } - - public void setSecondPopularizeUserId(Long secondPopularizeUserId) { - this.secondPopularizeUserId = secondPopularizeUserId; - } - public Long getUserId() { return userId; } @@ -225,10 +225,10 @@ public class BsDistributionRebate implements Serializable { BsDistributionRebate other = (BsDistributionRebate) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId())) && (this.getPopularizeUserId() == null ? other.getPopularizeUserId() == null : this.getPopularizeUserId().equals(other.getPopularizeUserId())) - && (this.getSecondPopularizeUserId() == null ? other.getSecondPopularizeUserId() == null : this.getSecondPopularizeUserId().equals(other.getSecondPopularizeUserId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName())) && (this.getIntegralNum() == null ? other.getIntegralNum() == null : this.getIntegralNum().equals(other.getIntegralNum())) @@ -246,10 +246,10 @@ public class BsDistributionRebate implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode()); result = prime * result + ((getPopularizeUserId() == null) ? 0 : getPopularizeUserId().hashCode()); - result = prime * result + ((getSecondPopularizeUserId() == null) ? 0 : getSecondPopularizeUserId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode()); result = prime * result + ((getIntegralNum() == null) ? 0 : getIntegralNum().hashCode()); @@ -270,10 +270,10 @@ public class BsDistributionRebate implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", title=").append(title); + sb.append(", type=").append(type); sb.append(", orderNo=").append(orderNo); sb.append(", agentId=").append(agentId); sb.append(", popularizeUserId=").append(popularizeUserId); - sb.append(", secondPopularizeUserId=").append(secondPopularizeUserId); sb.append(", userId=").append(userId); sb.append(", userName=").append(userName); sb.append(", integralNum=").append(integralNum); diff --git a/hai-service/src/main/java/com/hai/entity/BsDistributionRebateExample.java b/hai-service/src/main/java/com/hai/entity/BsDistributionRebateExample.java index 1cb597e4..40d29d03 100644 --- a/hai-service/src/main/java/com/hai/entity/BsDistributionRebateExample.java +++ b/hai-service/src/main/java/com/hai/entity/BsDistributionRebateExample.java @@ -256,6 +256,66 @@ public class BsDistributionRebateExample { return (Criteria) this; } + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; @@ -446,66 +506,6 @@ public class BsDistributionRebateExample { return (Criteria) this; } - public Criteria andSecondPopularizeUserIdIsNull() { - addCriterion("second_popularize_user_id is null"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdIsNotNull() { - addCriterion("second_popularize_user_id is not null"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdEqualTo(Long value) { - addCriterion("second_popularize_user_id =", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdNotEqualTo(Long value) { - addCriterion("second_popularize_user_id <>", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdGreaterThan(Long value) { - addCriterion("second_popularize_user_id >", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdGreaterThanOrEqualTo(Long value) { - addCriterion("second_popularize_user_id >=", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdLessThan(Long value) { - addCriterion("second_popularize_user_id <", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdLessThanOrEqualTo(Long value) { - addCriterion("second_popularize_user_id <=", value, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdIn(List values) { - addCriterion("second_popularize_user_id in", values, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdNotIn(List values) { - addCriterion("second_popularize_user_id not in", values, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdBetween(Long value1, Long value2) { - addCriterion("second_popularize_user_id between", value1, value2, "secondPopularizeUserId"); - return (Criteria) this; - } - - public Criteria andSecondPopularizeUserIdNotBetween(Long value1, Long value2) { - addCriterion("second_popularize_user_id not between", value1, value2, "secondPopularizeUserId"); - return (Criteria) this; - } - public Criteria andUserIdIsNull() { addCriterion("user_id is null"); return (Criteria) this;