From 11863ca3ac6a211fa41019b0ae3b2c1fbbdc3d40 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 10 Apr 2023 10:22:27 +0800
Subject: [PATCH] 设置内转开关
---
src/test/java/cc/mrbird/febs/AgentTest.java | 1 -
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 10 ++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 6 ++++++
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 23 ++++++++++++++++++++++-
4 files changed, 38 insertions(+), 2 deletions(-)
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 b3ece82..fdabd12 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.MemberLevelEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -281,6 +282,15 @@
@Override
public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
+ List<AdminAgentLevelOptionTreeVo> agentLevelOption = dataDictionaryCustomMapper.getAgentLevelOption();
+ AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVo = new AdminAgentLevelOptionTreeVo();
+ adminAgentLevelOptionTreeVo.setId(MemberLevelEnum.NORMAL.getType());
+ adminAgentLevelOptionTreeVo.setName("普通会员");
+ agentLevelOption.add(adminAgentLevelOptionTreeVo);
+ AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVos = new AdminAgentLevelOptionTreeVo();
+ adminAgentLevelOptionTreeVos.setId(MemberLevelEnum.V_DIRECTOR.getType());
+ adminAgentLevelOptionTreeVos.setName("董事");
+ agentLevelOption.add(adminAgentLevelOptionTreeVos);
return dataDictionaryCustomMapper.getAgentLevelOption();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 87ed2ec..eddb1a7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -105,6 +105,12 @@
if (inviteMember == null) {
throw new FebsException("邀请码不存在");
}
+ /**
+ * 设置成普通会员，则不允许推广
+ */
+ if(inviteMember.getLevel().equals(MemberLevelEnum.NORMAL.getType())){
+ throw new FebsException("非会员不能推广");
+ }
//购买套餐产生业绩，才能推广会员
List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
if(CollUtil.isEmpty(mallAchieveRecordList)){
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 bb1aa63..3cf4be6 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -238,7 +238,28 @@
// {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
+ {field: 'level', title: '会员类型',
+ templet: function (d) {
+ if (d.level === 'V1') {
+ return '<span">个体户</span>'
+ } else if (d.level === 'V2') {
+ return '<span">经销商</span>'
+ } else if (d.level === 'V3') {
+ return '<span">区代理</span>'
+ } else if (d.level === 'V4') {
+ return '<span">市代理</span>'
+ } else if (d.level === 'V5') {
+ return '<span">省代理</span>'
+ } else if (d.level === 'V6') {
+ return '<span">运营中心</span>'
+ } else if (d.level === 'NORMAL') {
+ return '<span">普通会员</span>'
+ } else if (d.level === 'V_DIRECTOR') {
+ return '<span">董事</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
// {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
// {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
{field: 'accountType', title: '账号类型',
diff --git a/src/test/java/cc/mrbird/febs/AgentTest.java b/src/test/java/cc/mrbird/febs/AgentTest.java
index 853c2c3..a86a5f4 100644
--- a/src/test/java/cc/mrbird/febs/AgentTest.java
+++ b/src/test/java/cc/mrbird/febs/AgentTest.java
@@ -623,6 +623,5 @@
@Test
public void orderReturnTest() {
- agentConsumer.orderReturnMoney("7");
}
}
--
Gitblit v1.9.1