diff --git a/service/src/main/java/com/hfkj/dao/BsUserMapper.java b/service/src/main/java/com/hfkj/dao/BsUserMapper.java index 876339b..42dc362 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsUserMapper.java @@ -42,12 +42,14 @@ public interface BsUserMapper extends BsUserMapperExt { "insert into bs_user (head_img, `name`, ", "phone, grade, wechat_num, ", "invite_user_id, invite_time, ", + "partner_level, partner_income_per, ", "`status`, create_time, ", "update_time, ext_1, ", "ext_2, ext_3)", "values (#{headImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ", "#{phone,jdbcType=VARCHAR}, #{grade,jdbcType=INTEGER}, #{wechatNum,jdbcType=VARCHAR}, ", "#{inviteUserId,jdbcType=BIGINT}, #{inviteTime,jdbcType=TIMESTAMP}, ", + "#{partnerLevel,jdbcType=INTEGER}, #{partnerIncomePer,jdbcType=DECIMAL}, ", "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" @@ -69,6 +71,8 @@ public interface BsUserMapper extends BsUserMapperExt { @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR), @Result(column="invite_user_id", property="inviteUserId", jdbcType=JdbcType.BIGINT), @Result(column="invite_time", property="inviteTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="partner_level", property="partnerLevel", jdbcType=JdbcType.INTEGER), + @Result(column="partner_income_per", property="partnerIncomePer", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -81,7 +85,8 @@ public interface BsUserMapper extends BsUserMapperExt { @Select({ "select", "id, head_img, `name`, phone, grade, wechat_num, invite_user_id, invite_time, ", - "`status`, create_time, update_time, ext_1, ext_2, ext_3", + "partner_level, partner_income_per, `status`, create_time, update_time, ext_1, ", + "ext_2, ext_3", "from bs_user", "where id = #{id,jdbcType=BIGINT}" }) @@ -94,6 +99,8 @@ public interface BsUserMapper extends BsUserMapperExt { @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR), @Result(column="invite_user_id", property="inviteUserId", jdbcType=JdbcType.BIGINT), @Result(column="invite_time", property="inviteTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="partner_level", property="partnerLevel", jdbcType=JdbcType.INTEGER), + @Result(column="partner_income_per", property="partnerIncomePer", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -121,6 +128,8 @@ public interface BsUserMapper extends BsUserMapperExt { "wechat_num = #{wechatNum,jdbcType=VARCHAR},", "invite_user_id = #{inviteUserId,jdbcType=BIGINT},", "invite_time = #{inviteTime,jdbcType=TIMESTAMP},", + "partner_level = #{partnerLevel,jdbcType=INTEGER},", + "partner_income_per = #{partnerIncomePer,jdbcType=DECIMAL},", "`status` = #{status,jdbcType=INTEGER},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java index d73baf0..107aec7 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java @@ -56,6 +56,14 @@ public class BsUserSqlProvider { sql.VALUES("invite_time", "#{inviteTime,jdbcType=TIMESTAMP}"); } + if (record.getPartnerLevel() != null) { + sql.VALUES("partner_level", "#{partnerLevel,jdbcType=INTEGER}"); + } + + if (record.getPartnerIncomePer() != null) { + sql.VALUES("partner_income_per", "#{partnerIncomePer,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -97,6 +105,8 @@ public class BsUserSqlProvider { sql.SELECT("wechat_num"); sql.SELECT("invite_user_id"); sql.SELECT("invite_time"); + sql.SELECT("partner_level"); + sql.SELECT("partner_income_per"); sql.SELECT("`status`"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -152,6 +162,14 @@ public class BsUserSqlProvider { sql.SET("invite_time = #{record.inviteTime,jdbcType=TIMESTAMP}"); } + if (record.getPartnerLevel() != null) { + sql.SET("partner_level = #{record.partnerLevel,jdbcType=INTEGER}"); + } + + if (record.getPartnerIncomePer() != null) { + sql.SET("partner_income_per = #{record.partnerIncomePer,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -192,6 +210,8 @@ public class BsUserSqlProvider { sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}"); sql.SET("invite_user_id = #{record.inviteUserId,jdbcType=BIGINT}"); sql.SET("invite_time = #{record.inviteTime,jdbcType=TIMESTAMP}"); + sql.SET("partner_level = #{record.partnerLevel,jdbcType=INTEGER}"); + sql.SET("partner_income_per = #{record.partnerIncomePer,jdbcType=DECIMAL}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -236,6 +256,14 @@ public class BsUserSqlProvider { sql.SET("invite_time = #{inviteTime,jdbcType=TIMESTAMP}"); } + if (record.getPartnerLevel() != null) { + sql.SET("partner_level = #{partnerLevel,jdbcType=INTEGER}"); + } + + if (record.getPartnerIncomePer() != null) { + sql.SET("partner_income_per = #{partnerIncomePer,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsUser.java b/service/src/main/java/com/hfkj/entity/BsUser.java index 9dae977..7447507 100644 --- a/service/src/main/java/com/hfkj/entity/BsUser.java +++ b/service/src/main/java/com/hfkj/entity/BsUser.java @@ -1,6 +1,7 @@ package com.hfkj.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -53,6 +54,16 @@ public class BsUser implements Serializable { */ private Date inviteTime; + /** + * 合伙人等级 + */ + private Integer partnerLevel; + + /** + * 合伙人权益收益加成 + */ + private BigDecimal partnerIncomePer; + /** * 状态 0：删除 1：正常 2：禁用 */ @@ -140,6 +151,22 @@ public class BsUser implements Serializable { this.inviteTime = inviteTime; } + public Integer getPartnerLevel() { + return partnerLevel; + } + + public void setPartnerLevel(Integer partnerLevel) { + this.partnerLevel = partnerLevel; + } + + public BigDecimal getPartnerIncomePer() { + return partnerIncomePer; + } + + public void setPartnerIncomePer(BigDecimal partnerIncomePer) { + this.partnerIncomePer = partnerIncomePer; + } + public Integer getStatus() { return status; } @@ -208,6 +235,8 @@ public class BsUser implements Serializable { && (this.getWechatNum() == null ? other.getWechatNum() == null : this.getWechatNum().equals(other.getWechatNum())) && (this.getInviteUserId() == null ? other.getInviteUserId() == null : this.getInviteUserId().equals(other.getInviteUserId())) && (this.getInviteTime() == null ? other.getInviteTime() == null : this.getInviteTime().equals(other.getInviteTime())) + && (this.getPartnerLevel() == null ? other.getPartnerLevel() == null : this.getPartnerLevel().equals(other.getPartnerLevel())) + && (this.getPartnerIncomePer() == null ? other.getPartnerIncomePer() == null : this.getPartnerIncomePer().equals(other.getPartnerIncomePer())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) @@ -228,6 +257,8 @@ public class BsUser implements Serializable { result = prime * result + ((getWechatNum() == null) ? 0 : getWechatNum().hashCode()); result = prime * result + ((getInviteUserId() == null) ? 0 : getInviteUserId().hashCode()); result = prime * result + ((getInviteTime() == null) ? 0 : getInviteTime().hashCode()); + result = prime * result + ((getPartnerLevel() == null) ? 0 : getPartnerLevel().hashCode()); + result = prime * result + ((getPartnerIncomePer() == null) ? 0 : getPartnerIncomePer().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); @@ -251,6 +282,8 @@ public class BsUser implements Serializable { sb.append(", wechatNum=").append(wechatNum); sb.append(", inviteUserId=").append(inviteUserId); sb.append(", inviteTime=").append(inviteTime); + sb.append(", partnerLevel=").append(partnerLevel); + sb.append(", partnerIncomePer=").append(partnerIncomePer); sb.append(", status=").append(status); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); diff --git a/service/src/main/java/com/hfkj/entity/BsUserExample.java b/service/src/main/java/com/hfkj/entity/BsUserExample.java index 43d5a69..f305789 100644 --- a/service/src/main/java/com/hfkj/entity/BsUserExample.java +++ b/service/src/main/java/com/hfkj/entity/BsUserExample.java @@ -1,5 +1,6 @@ package com.hfkj.entity; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -645,6 +646,126 @@ public class BsUserExample { return (Criteria) this; } + public Criteria andPartnerLevelIsNull() { + addCriterion("partner_level is null"); + return (Criteria) this; + } + + public Criteria andPartnerLevelIsNotNull() { + addCriterion("partner_level is not null"); + return (Criteria) this; + } + + public Criteria andPartnerLevelEqualTo(Integer value) { + addCriterion("partner_level =", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelNotEqualTo(Integer value) { + addCriterion("partner_level <>", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelGreaterThan(Integer value) { + addCriterion("partner_level >", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelGreaterThanOrEqualTo(Integer value) { + addCriterion("partner_level >=", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelLessThan(Integer value) { + addCriterion("partner_level <", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelLessThanOrEqualTo(Integer value) { + addCriterion("partner_level <=", value, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelIn(List values) { + addCriterion("partner_level in", values, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelNotIn(List values) { + addCriterion("partner_level not in", values, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelBetween(Integer value1, Integer value2) { + addCriterion("partner_level between", value1, value2, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerLevelNotBetween(Integer value1, Integer value2) { + addCriterion("partner_level not between", value1, value2, "partnerLevel"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerIsNull() { + addCriterion("partner_income_per is null"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerIsNotNull() { + addCriterion("partner_income_per is not null"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerEqualTo(BigDecimal value) { + addCriterion("partner_income_per =", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerNotEqualTo(BigDecimal value) { + addCriterion("partner_income_per <>", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerGreaterThan(BigDecimal value) { + addCriterion("partner_income_per >", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("partner_income_per >=", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerLessThan(BigDecimal value) { + addCriterion("partner_income_per <", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerLessThanOrEqualTo(BigDecimal value) { + addCriterion("partner_income_per <=", value, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerIn(List values) { + addCriterion("partner_income_per in", values, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerNotIn(List values) { + addCriterion("partner_income_per not in", values, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("partner_income_per between", value1, value2, "partnerIncomePer"); + return (Criteria) this; + } + + public Criteria andPartnerIncomePerNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("partner_income_per not between", value1, value2, "partnerIncomePer"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;