diff --git a/document/sql/mall_structure.sql b/document/sql/mall_structure.sql index fe12e8b..9084504 100644 --- a/document/sql/mall_structure.sql +++ b/document/sql/mall_structure.sql @@ -989,8 +989,10 @@ CREATE TABLE IF NOT EXISTS `ums_member` ( `growth` int(11) DEFAULT NULL COMMENT '成长值', `luckey_count` int(11) DEFAULT NULL COMMENT '剩余抽奖次数', `history_integration` int(11) DEFAULT NULL COMMENT '历史积分数量', + `invitation_code` varchar(15) DEFAULT NULL COMMENT '12位邀请码', PRIMARY KEY (`id`), UNIQUE KEY `idx_username` (`username`), + UNIQUE KEY `idx_invitation_code` (`invitation_code`), UNIQUE KEY `idx_phone` (`phone`) ) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COMMENT='会员表'; diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMember.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMember.java index 72268c1..44ce7a0 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMember.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMember.java @@ -7,11 +7,11 @@ import java.util.Date; import io.swagger.annotations.ApiModelProperty; public class UmsMember implements Serializable { - + private Long id; private Long memberLevelId; - + private MemberLevel memberLevel; @ApiModelProperty(value = "用户名") @@ -64,25 +64,25 @@ public class UmsMember implements Serializable { @ApiModelProperty(value = "历史积分数量") private Integer historyIntegration; - + @ApiModelProperty(value = "分销实体店状态(0->未开店;1->已开店)") private StoreStatus storeStatus; - + /** * 余额 */ private BigDecimal balance; - + /** * 冻结余额 */ private BigDecimal freeze; - + /** * 详细地址 */ private String detailAddress; - + /** * 真实姓名 */ @@ -94,6 +94,9 @@ public class UmsMember implements Serializable { @ApiModelProperty(value = "排队状态:0->未排队;1->排队中") private Integer orderStatus; + @ApiModelProperty(value = "邀请码") + private String invitationCode; + private static final long serialVersionUID = 1L; public Long getId() { @@ -279,7 +282,7 @@ public class UmsMember implements Serializable { public void setFreeze(BigDecimal freeze) { this.freeze = freeze; } - + public String getDetailAddress() { return detailAddress; } @@ -304,6 +307,14 @@ public class UmsMember implements Serializable { this.orderStatus = orderStatus; } + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberExample.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberExample.java index 9db6fbd..7142ad3 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberExample.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberExample.java @@ -1,5 +1,6 @@ package com.buy507.mall.model; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; @@ -252,6 +253,66 @@ public class UmsMemberExample { return (Criteria) this; } + public Criteria andMemberLevelIsNull() { + addCriterion("member_level is null"); + return (Criteria) this; + } + + public Criteria andMemberLevelIsNotNull() { + addCriterion("member_level is not null"); + return (Criteria) this; + } + + public Criteria andMemberLevelEqualTo(Integer value) { + addCriterion("member_level =", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelNotEqualTo(Integer value) { + addCriterion("member_level <>", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelGreaterThan(Integer value) { + addCriterion("member_level >", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelGreaterThanOrEqualTo(Integer value) { + addCriterion("member_level >=", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelLessThan(Integer value) { + addCriterion("member_level <", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelLessThanOrEqualTo(Integer value) { + addCriterion("member_level <=", value, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelIn(List values) { + addCriterion("member_level in", values, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelNotIn(List values) { + addCriterion("member_level not in", values, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelBetween(Integer value1, Integer value2) { + addCriterion("member_level between", value1, value2, "memberLevel"); + return (Criteria) this; + } + + public Criteria andMemberLevelNotBetween(Integer value1, Integer value2) { + addCriterion("member_level not between", value1, value2, "memberLevel"); + return (Criteria) this; + } + public Criteria andUsernameIsNull() { addCriterion("username is null"); return (Criteria) this; @@ -1351,6 +1412,456 @@ public class UmsMemberExample { addCriterion("history_integration not between", value1, value2, "historyIntegration"); return (Criteria) this; } + + public Criteria andStoreStatusIsNull() { + addCriterion("store_status is null"); + return (Criteria) this; + } + + public Criteria andStoreStatusIsNotNull() { + addCriterion("store_status is not null"); + return (Criteria) this; + } + + public Criteria andStoreStatusEqualTo(Integer value) { + addCriterion("store_status =", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusNotEqualTo(Integer value) { + addCriterion("store_status <>", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusGreaterThan(Integer value) { + addCriterion("store_status >", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("store_status >=", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusLessThan(Integer value) { + addCriterion("store_status <", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusLessThanOrEqualTo(Integer value) { + addCriterion("store_status <=", value, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusIn(List values) { + addCriterion("store_status in", values, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusNotIn(List values) { + addCriterion("store_status not in", values, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusBetween(Integer value1, Integer value2) { + addCriterion("store_status between", value1, value2, "storeStatus"); + return (Criteria) this; + } + + public Criteria andStoreStatusNotBetween(Integer value1, Integer value2) { + addCriterion("store_status not between", value1, value2, "storeStatus"); + return (Criteria) this; + } + + public Criteria andBalanceIsNull() { + addCriterion("balance is null"); + return (Criteria) this; + } + + public Criteria andBalanceIsNotNull() { + addCriterion("balance is not null"); + return (Criteria) this; + } + + public Criteria andBalanceEqualTo(BigDecimal value) { + addCriterion("balance =", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceNotEqualTo(BigDecimal value) { + addCriterion("balance <>", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceGreaterThan(BigDecimal value) { + addCriterion("balance >", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("balance >=", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceLessThan(BigDecimal value) { + addCriterion("balance <", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceLessThanOrEqualTo(BigDecimal value) { + addCriterion("balance <=", value, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceIn(List values) { + addCriterion("balance in", values, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceNotIn(List values) { + addCriterion("balance not in", values, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("balance between", value1, value2, "balance"); + return (Criteria) this; + } + + public Criteria andBalanceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("balance not between", value1, value2, "balance"); + return (Criteria) this; + } + + public Criteria andFreezeIsNull() { + addCriterion("freeze is null"); + return (Criteria) this; + } + + public Criteria andFreezeIsNotNull() { + addCriterion("freeze is not null"); + return (Criteria) this; + } + + public Criteria andFreezeEqualTo(BigDecimal value) { + addCriterion("freeze =", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeNotEqualTo(BigDecimal value) { + addCriterion("freeze <>", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeGreaterThan(BigDecimal value) { + addCriterion("freeze >", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("freeze >=", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeLessThan(BigDecimal value) { + addCriterion("freeze <", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeLessThanOrEqualTo(BigDecimal value) { + addCriterion("freeze <=", value, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeIn(List values) { + addCriterion("freeze in", values, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeNotIn(List values) { + addCriterion("freeze not in", values, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freeze between", value1, value2, "freeze"); + return (Criteria) this; + } + + public Criteria andFreezeNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("freeze not between", value1, value2, "freeze"); + return (Criteria) this; + } + + public Criteria andDetailAddressIsNull() { + addCriterion("detail_address is null"); + return (Criteria) this; + } + + public Criteria andDetailAddressIsNotNull() { + addCriterion("detail_address is not null"); + return (Criteria) this; + } + + public Criteria andDetailAddressEqualTo(String value) { + addCriterion("detail_address =", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotEqualTo(String value) { + addCriterion("detail_address <>", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressGreaterThan(String value) { + addCriterion("detail_address >", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressGreaterThanOrEqualTo(String value) { + addCriterion("detail_address >=", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLessThan(String value) { + addCriterion("detail_address <", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLessThanOrEqualTo(String value) { + addCriterion("detail_address <=", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressLike(String value) { + addCriterion("detail_address like", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotLike(String value) { + addCriterion("detail_address not like", value, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressIn(List values) { + addCriterion("detail_address in", values, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotIn(List values) { + addCriterion("detail_address not in", values, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressBetween(String value1, String value2) { + addCriterion("detail_address between", value1, value2, "detailAddress"); + return (Criteria) this; + } + + public Criteria andDetailAddressNotBetween(String value1, String value2) { + addCriterion("detail_address not between", value1, value2, "detailAddress"); + return (Criteria) this; + } + + public Criteria andRealNameIsNull() { + addCriterion("real_name is null"); + return (Criteria) this; + } + + public Criteria andRealNameIsNotNull() { + addCriterion("real_name is not null"); + return (Criteria) this; + } + + public Criteria andRealNameEqualTo(String value) { + addCriterion("real_name =", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameNotEqualTo(String value) { + addCriterion("real_name <>", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameGreaterThan(String value) { + addCriterion("real_name >", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameGreaterThanOrEqualTo(String value) { + addCriterion("real_name >=", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameLessThan(String value) { + addCriterion("real_name <", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameLessThanOrEqualTo(String value) { + addCriterion("real_name <=", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameLike(String value) { + addCriterion("real_name like", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameNotLike(String value) { + addCriterion("real_name not like", value, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameIn(List values) { + addCriterion("real_name in", values, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameNotIn(List values) { + addCriterion("real_name not in", values, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameBetween(String value1, String value2) { + addCriterion("real_name between", value1, value2, "realName"); + return (Criteria) this; + } + + public Criteria andRealNameNotBetween(String value1, String value2) { + addCriterion("real_name not between", value1, value2, "realName"); + return (Criteria) this; + } + + public Criteria andOrderStatusIsNull() { + addCriterion("order_status is null"); + return (Criteria) this; + } + + public Criteria andOrderStatusIsNotNull() { + addCriterion("order_status is not null"); + return (Criteria) this; + } + + public Criteria andOrderStatusEqualTo(Integer value) { + addCriterion("order_status =", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusNotEqualTo(Integer value) { + addCriterion("order_status <>", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusGreaterThan(Integer value) { + addCriterion("order_status >", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("order_status >=", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusLessThan(Integer value) { + addCriterion("order_status <", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusLessThanOrEqualTo(Integer value) { + addCriterion("order_status <=", value, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusIn(List values) { + addCriterion("order_status in", values, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusNotIn(List values) { + addCriterion("order_status not in", values, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusBetween(Integer value1, Integer value2) { + addCriterion("order_status between", value1, value2, "orderStatus"); + return (Criteria) this; + } + + public Criteria andOrderStatusNotBetween(Integer value1, Integer value2) { + addCriterion("order_status not between", value1, value2, "orderStatus"); + return (Criteria) this; + } + + public Criteria andInvitationCodeIsNull() { + addCriterion("invitation_code is null"); + return (Criteria) this; + } + + public Criteria andInvitationCodeIsNotNull() { + addCriterion("invitation_code is not null"); + return (Criteria) this; + } + + public Criteria andInvitationCodeEqualTo(String value) { + addCriterion("invitation_code =", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeNotEqualTo(String value) { + addCriterion("invitation_code <>", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeGreaterThan(String value) { + addCriterion("invitation_code >", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeGreaterThanOrEqualTo(String value) { + addCriterion("invitation_code >=", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeLessThan(String value) { + addCriterion("invitation_code <", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeLessThanOrEqualTo(String value) { + addCriterion("invitation_code <=", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeLike(String value) { + addCriterion("invitation_code like", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeNotLike(String value) { + addCriterion("invitation_code not like", value, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeIn(List values) { + addCriterion("invitation_code in", values, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeNotIn(List values) { + addCriterion("invitation_code not in", values, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeBetween(String value1, String value2) { + addCriterion("invitation_code between", value1, value2, "invitationCode"); + return (Criteria) this; + } + + public Criteria andInvitationCodeNotBetween(String value1, String value2) { + addCriterion("invitation_code not between", value1, value2, "invitationCode"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberMapper.xml index 2d7cade..076fed5 100644 --- a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberMapper.xml +++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberMapper.xml @@ -28,6 +28,7 @@ + @@ -90,7 +91,7 @@ id, member_level_id, member_level, username, password, nickname, phone, status, create_time, icon, gender, birthday, city, job, personalized_signature, source_type, integration, growth, - luckey_count, history_integration, store_status, balance, freeze, detail_address, real_name,order_status + luckey_count, history_integration, store_status, balance, freeze, detail_address, real_name,order_status,invitation_code @@ -388,7 +397,10 @@ real_name = #{record.realName,jdbcType=VARCHAR}, - order_status = #{record.growth,jdbcType=INTEGER}, + order_status = #{record.orderStatus,jdbcType=INTEGER}, + + + invitation_code = #{record.invitationCode,jdbcType=VARCHAR}, @@ -422,7 +434,8 @@ freeze = #{record.freeze,jdbcType=DECIMAL}, detail_address = #{record.detailAddress,jdbcType=VARCHAR}, real_name = #{record.realName,jdbcType=VARCHAR}, - order_status = #{record.orderStatus,jdbcType=INTEGER} + order_status = #{record.orderStatus,jdbcType=INTEGER}, + invitation_code = #{record.invitationCode,jdbcType=VARCHAR} @@ -505,6 +518,9 @@ order_status = #{orderStatus,jdbcType=INTEGER}, + + invitation_code = #{invitationCode,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} @@ -534,7 +550,8 @@ freeze = #{freeze,jdbcType=DECIMAL}, detail_address = #{detailAddress,jdbcType=VARCHAR}, real_name = #{realName,jdbcType=VARCHAR}, - order_status = #{orderStatus,jdbcType=INTEGER} + order_status = #{orderStatus,jdbcType=INTEGER}, + invitation_code = #{invitationCode,jdbcType=VARCHAR} where id = #{id,jdbcType=BIGINT}