liqiang/hui_mall
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加入队列分润逻辑

Browse Source
This commit is contained in:
李强
2024-11-07 18:07:14 +08:00
parent aea65c9782
commit a4c54b16c8
16 changed files with 669 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mall-dao/src/main/java/com/buy507/mall/model/MemberLevel.java
View File

@@ -7,15 +7,15 @@ package com.buy507.mall.model;
*/
public enum MemberLevel {
/**普通用户**/
Member(1),
Member(0),
/**vip会员**/
Consumer(2),
Consumer(1),
/**店长**/
Partner(3),
Partner(2),
/**代理**/
Diamond(4),
Diamond(3),
/** 市代 **/
OneDiamond(5),
OneDiamond(4),
TwoDiamond(6), //中级合作商
ThreeDiamond(7), //高级合作商
FourDiamond(8); //特级合作商
@@ -30,4 +30,12 @@ public enum MemberLevel {
return value;
}
public static MemberLevel getMemberByInt(int value){
for (MemberLevel memberLevel : MemberLevel.values()) {
if(value == memberLevel.value){
return memberLevel;
}
}
return null;
}
}

2
mall-dao/src/main/java/com/buy507/mall/model/UmsMember.java
View File

@@ -337,4 +337,6 @@ public class UmsMember implements Serializable {
}
}

12
mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTree.java
View File

@@ -11,9 +11,6 @@ public class UmsMemberRelationTree implements Serializable {
@ApiModelProperty(value = "会员id")
private Long memberId;
@ApiModelProperty(value = "下级会员id")
private Long lowerLevelId;
@ApiModelProperty(value = "上级会员id")
private Long higherLevelId;
@@ -38,14 +35,6 @@ public class UmsMemberRelationTree implements Serializable {
this.memberId = memberId;
}
public Long getLowerLevelId() {
return lowerLevelId;
}
public void setLowerLevelId(Long lowerLevelId) {
this.lowerLevelId = lowerLevelId;
}
public Long getHigherLevelId() {
return higherLevelId;
}
@@ -70,7 +59,6 @@ public class UmsMemberRelationTree implements Serializable {
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", memberId=").append(memberId);
sb.append(", lowerLevelId=").append(lowerLevelId);
sb.append(", higherLevelId=").append(higherLevelId);
sb.append(", createTime=").append(createTime);
sb.append(", serialVersionUID=").append(serialVersionUID);

60
mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTreeExample.java
View File

@@ -225,66 +225,6 @@ public class UmsMemberRelationTreeExample {
return (Criteria) this;
}
public Criteria andLowerLevelIdIsNull() {
addCriterion("lower_level_id is null");
return (Criteria) this;
}
public Criteria andLowerLevelIdIsNotNull() {
addCriterion("lower_level_id is not null");
return (Criteria) this;
}
public Criteria andLowerLevelIdEqualTo(Long value) {
addCriterion("lower_level_id =", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdNotEqualTo(Long value) {
addCriterion("lower_level_id <>", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdGreaterThan(Long value) {
addCriterion("lower_level_id >", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdGreaterThanOrEqualTo(Long value) {
addCriterion("lower_level_id >=", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdLessThan(Long value) {
addCriterion("lower_level_id <", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdLessThanOrEqualTo(Long value) {
addCriterion("lower_level_id <=", value, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdIn(List<Long> values) {
addCriterion("lower_level_id in", values, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdNotIn(List<Long> values) {
addCriterion("lower_level_id not in", values, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdBetween(Long value1, Long value2) {
addCriterion("lower_level_id between", value1, value2, "lowerLevelId");
return (Criteria) this;
}
public Criteria andLowerLevelIdNotBetween(Long value1, Long value2) {
addCriterion("lower_level_id not between", value1, value2, "lowerLevelId");
return (Criteria) this;
}
public Criteria andHigherLevelIdIsNull() {
addCriterion("higher_level_id is null");
return (Criteria) this;

5
mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml
View File

@@ -109,11 +109,10 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into ums_member_account_transaction (member_id, order_id, revenue_amount,
transaction_state, remarks, commission_ratio,
create_time, transfer_payment_time)
transaction_state, remarks, commission_ratio, transfer_payment_time)
values (#{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{revenueAmount,jdbcType=DECIMAL},
#{transactionState,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, #{commissionRatio,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{transferPaymentTime,jdbcType=TIMESTAMP})
#{transferPaymentTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.buy507.mall.model.UmsMemberAccountTransaction">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">

4
mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberMapper.xml
View File

@@ -533,8 +533,8 @@
balance = #{balance,jdbcType=DECIMAL},
freeze = #{freeze,jdbcType=DECIMAL},
detail_address = #{detailAddress,jdbcType=VARCHAR},
real_name = #{realName,jdbcType=VARCHAR}
order_status = #{orderStatus,jdbcType=INTEGER},
real_name = #{realName,jdbcType=VARCHAR},
order_status = #{orderStatus,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectPhoneExists" parameterType="java.lang.String" resultMap="BaseResultMap">

5
mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.xml
View File

@@ -109,11 +109,10 @@
SELECT LAST_INSERT_ID()
</selectKey>
insert into ums_member_order_queue (member_id, order_id, order_amount,
queue_index, quit_queue_mark, queue_type,
remain_number, create_time)
queue_index, quit_queue_mark, queue_type,remain_number)
values (#{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{orderAmount,jdbcType=DECIMAL},
#{queueIndex,jdbcType=BIGINT}, #{quitQueueMark,jdbcType=INTEGER}, #{queueType,jdbcType=INTEGER},
#{remainNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
#{remainNumber,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.buy507.mall.model.UmsMemberOrderQueue">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">

25
mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberRelationTreeMapper.xml
View File

@@ -4,7 +4,6 @@
<resultMap id="BaseResultMap" type="com.buy507.mall.model.UmsMemberRelationTree">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="member_id" jdbcType="BIGINT" property="memberId" />
<result column="lower_level_id" jdbcType="BIGINT" property="lowerLevelId" />
<result column="higher_level_id" jdbcType="BIGINT" property="higherLevelId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>
@@ -67,7 +66,7 @@
</where>
</sql>
<sql id="Base_Column_List">
id, member_id, lower_level_id, higher_level_id, create_time
id, member_id, higher_level_id, create_time
</sql>
<select id="selectByExample" parameterType="com.buy507.mall.model.UmsMemberRelationTreeExample" resultMap="BaseResultMap">
select
@@ -103,10 +102,10 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into ums_member_relation_tree (member_id, lower_level_id, higher_level_id,
create_time)
values (#{memberId,jdbcType=BIGINT}, #{lowerLevelId,jdbcType=BIGINT}, #{higherLevelId,jdbcType=BIGINT},
#{createTime,jdbcType=TIMESTAMP})
insert into ums_member_relation_tree (member_id, higher_level_id, create_time
)
values (#{memberId,jdbcType=BIGINT}, #{higherLevelId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.buy507.mall.model.UmsMemberRelationTree">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -117,9 +116,6 @@
<if test="memberId != null">
member_id,
</if>
<if test="lowerLevelId != null">
lower_level_id,
</if>
<if test="higherLevelId != null">
higher_level_id,
</if>
@@ -131,9 +127,6 @@
<if test="memberId != null">
#{memberId,jdbcType=BIGINT},
</if>
<if test="lowerLevelId != null">
#{lowerLevelId,jdbcType=BIGINT},
</if>
<if test="higherLevelId != null">
#{higherLevelId,jdbcType=BIGINT},
</if>
@@ -157,9 +150,6 @@
<if test="record.memberId != null">
member_id = #{record.memberId,jdbcType=BIGINT},
</if>
<if test="record.lowerLevelId != null">
lower_level_id = #{record.lowerLevelId,jdbcType=BIGINT},
</if>
<if test="record.higherLevelId != null">
higher_level_id = #{record.higherLevelId,jdbcType=BIGINT},
</if>
@@ -175,7 +165,6 @@
update ums_member_relation_tree
set id = #{record.id,jdbcType=BIGINT},
member_id = #{record.memberId,jdbcType=BIGINT},
lower_level_id = #{record.lowerLevelId,jdbcType=BIGINT},
higher_level_id = #{record.higherLevelId,jdbcType=BIGINT},
create_time = #{record.createTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
@@ -188,9 +177,6 @@
<if test="memberId != null">
member_id = #{memberId,jdbcType=BIGINT},
</if>
<if test="lowerLevelId != null">
lower_level_id = #{lowerLevelId,jdbcType=BIGINT},
</if>
<if test="higherLevelId != null">
higher_level_id = #{higherLevelId,jdbcType=BIGINT},
</if>
@@ -203,7 +189,6 @@
<update id="updateByPrimaryKey" parameterType="com.buy507.mall.model.UmsMemberRelationTree">
update ums_member_relation_tree
set member_id = #{memberId,jdbcType=BIGINT},
lower_level_id = #{lowerLevelId,jdbcType=BIGINT},
higher_level_id = #{higherLevelId,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}