From 1fc5510367dcf321ac85e50e31c9dcdaaf5cd09e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Dec 2022 11:56:27 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 5 +++++
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 5 +++++
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 6 +++++-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 4 ++--
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 36afe16..32088a6 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -139,4 +139,9 @@
*/
private String accountLevel;
+ /**
+ * 手动添加代理状态 1-手动添加
+ */
+ private Integer levelStatus;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
index 4c9a605..cb00b93 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -206,6 +206,11 @@
List<MallMember> agentLevelList = mallMemberMapper.selectByAccountLevel(levelSelf);
if(CollUtil.isNotEmpty(agentLevelList)){
for(MallMember mallMember : agentLevelList){
+ //如果代理等级为手动设置，则跳过该会员
+ int levelStatus = ObjectUtil.isEmpty(mallMember.getLevelStatus()) ? 0 : 1;
+ if(1 == levelStatus){
+ continue;
+ }
//有星级的直推
Integer directCnt = mallMemberMapper.selectByRefererIdAndAccountLevel(mallMember.getInviteId(),MemberAccountLevelEnum.NORMAL.getName());
//团队中星级会员数量
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index b9e686b..33f1fd4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.MemberAgentLevelEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -417,7 +418,10 @@
if(ObjectUtil.isEmpty(mallMember)){
return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
}
- mallMember.setLevel(agentLevelSetUpdateDto.getLevelCode());
+ String levelCode = agentLevelSetUpdateDto.getLevelCode();
+ String nameByCode = MemberAgentLevelEnum.AGENT.getNameByCode(levelCode);
+ mallMember.setLevel(nameByCode);
+ mallMember.setLevelStatus(1);
mallMemberMapper.updateById(mallMember);
return new FebsResponse().success();
}
diff --git a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
index ac88217..a653e1f 100644
--- a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -32,7 +32,7 @@
<select id="getAgentLevelOption" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo">
select a.code id,a.description name from data_dictionary_custom a
- where a.type='AGENT_LEVEL' and a.code != 'ZERO_LEVEL'
+ where a.type='MEMBER_AGENT_LEVEL'
</select>
<select id="getRankAwardUpdateInfoById" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 2dad877..15cdfce 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -96,8 +96,8 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>
--
Gitblit v1.9.1