From 66fdac21a55b328a963a149e38252f9cc02143d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 10 Apr 2023 11:46:52 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 6 +++
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 4 +
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 4 -
src/main/java/cc/mrbird/febs/common/utils/AppContants.java | 5 ++
src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java | 23 +++++------
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 14 ++++---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 2 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 15 +++----
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 33 +++++++++++++---
9 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java
index d872787..60e18fe 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MemberLevelEnum.java
@@ -8,24 +8,23 @@
@Getter
public enum MemberLevelEnum {
/**
- * 合伙人
- */
- V_PARTNER("V_PARTNER",8),
- /**
* 董事
*/
- V_DIRECTOR("V_DIRECTOR",7),
+ V_DIRECTOR("V_DIRECTOR",8),
/**
* v1-v6
+ * V1 个体户，V2 经销商，V3 区代理，V4 市代理，V5 省代理，V6 运营中心
*/
- V6("V6",6),
- V5("V5",5),
- V4("V4",4),
- V3("V3",3),
- V2("V2",2),
- V1("V1",1),
+ V6("V6",7),
+ V5("V5",6),
+ V4("V4",5),
+ V3("V3",4),
+ V2("V2",3),
+ V1("V1",2),
//普通用户
- NORMAL("NORMAL",0);
+ NORMAL("NORMAL",1),
+ //粉丝非会员
+ FANS("FANS",0);
private String type;
diff --git a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
index 08bb527..fb26059 100644
--- a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java
@@ -67,6 +67,11 @@
*/
public static final int IS_RETURN_YES = 1;
public static final int IS_RETURN_NO = 2;
+ /**
+ * 1:是 2：否
+ */
+ public static final int OPTION_YES = 1;
+ public static final int OPTION_NO = 2;
public static final String REDIS_ORDER_OVERTIME_PREFIX = "order_overtime_";
public static final String REDIS_ORDER_OVERTIME = "order_overtime_{}_{}";
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index e62484f..462e762 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -211,7 +211,9 @@
@GetMapping("agentLevelSet/{id}")
@RequiresPermissions("agentLevelSet:update")
public String agentLevelSet(@PathVariable long id, Model model) {
- AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ AdminAgentLevelSetInfoVo data = new AdminAgentLevelSetInfoVo();
+ data.setId(id);
model.addAttribute("agentLevelSet", data);
return FebsUtil.view("modules/mallMember/agentLevelSet");
}
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 fdabd12..ec0abbc 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
@@ -112,6 +112,8 @@
mallMember.setDirector(value);
} else if (type == 2){
mallMember.setStoreMaster(value);
+ }else if (type == 3){
+ mallMember.setPartner(value);
} else {
throw new FebsException("参数错误");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 7c3e128..a79369c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -56,9 +56,6 @@
String nextLevelName = MemberLevelEnum.NORMAL.getNextLevel(parent.getLevel());
int levelCode = MemberLevelEnum.NORMAL.getLevelCode(nextLevelName);
if(levelCode == 8){
- continue;
- }
- if(levelCode == 7){
//level为v6，升级董事，则看团队下有没有两个V6
List<MallMember> mallMemberTeamMembers = memberMapper.selectAllChildAgentListByInviteId(parent.getInviteId());
List<MallMember> levelV6List = mallMemberTeamMembers.stream()
@@ -66,6 +63,7 @@
.collect(Collectors.toList());
if(CollUtil.isNotEmpty(levelV6List) && levelV6List.size() >= 2){
parent.setLevel(MemberLevelEnum.V_DIRECTOR.getType());
+ parent.setDirector(AppContants.OPTION_YES);
memberMapper.updateById(parent);
}
continue;
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 eddb1a7..03e3920 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
@@ -108,13 +108,13 @@
/**
* 设置成普通会员，则不允许推广
*/
- if(inviteMember.getLevel().equals(MemberLevelEnum.NORMAL.getType())){
- throw new FebsException("非会员不能推广");
+ if(inviteMember.getLevel().equals(MemberLevelEnum.FANS.getType())){
+ throw new FebsException("邀请码不能推广");
}
//购买套餐产生业绩，才能推广会员
List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
if(CollUtil.isEmpty(mallAchieveRecordList)){
- throw new FebsException("非会员不能推广");
+ throw new FebsException("邀请码不能推广");
}
mallMember.setReferrerId(registerDto.getInviteId());
@@ -123,7 +123,7 @@
mallMember.setName(registerDto.getName());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel(MemberLevelEnum.NORMAL.name());
+ mallMember.setLevel(MemberLevelEnum.FANS.name());
mallMember.setSex("男");
mallMember.setBindPhone(registerDto.getAccount());
@@ -249,11 +249,8 @@
if (payment != null) {
mallMemberVo.setHasPayment(1);
}
-
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL, mallMember.getLevel());
- if (dic != null) {
- mallMemberVo.setLevelName(dic.getDescription());
- }
+ mallMemberVo.setLevelName(mallMember.getLevel());
+ mallMemberVo.setPartner(mallMember.getPartner());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 1080ba8..73cc655 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -79,6 +79,12 @@
private Integer director;
/**
+ * 合伙人
+ */
+ @ApiModelProperty(value = "是否为合伙人 1-是 2-否")
+ private Integer partner;
+
+ /**
* 店长
*/
@ApiModelProperty(value = "是否店长 1-是 2-否")
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index 0aa1436..09c7e7e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -25,12 +25,14 @@
<select name="level">
<option value="">请选择</option>
<option value="NORMAL">普通会员</option>
- <option value="V1">V1</option>
- <option value="V2">V2</option>
- <option value="V3">V3</option>
- <option value="V4">V4</option>
- <option value="V5">V5</option>
- <option value="V6">V6</option>
+ <option value="V1">个体户</option>
+ <option value="V2">经销商</option>
+ <option value="V3">区代理</option>
+ <option value="V4">市代理</option>
+ <option value="V5">省代理</option>
+ <option value="V6">运营中心</option>
+ <option value="FANS">粉丝</option>
+ <option value="V_DIRECTOR">董事</option>
</select>
</div>
</div>
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 3cf4be6..d89075f 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -25,12 +25,14 @@
<select name="level">
<option value="">请选择</option>
<option value="NORMAL">普通会员</option>
- <option value="V1">V1</option>
- <option value="V2">V2</option>
- <option value="V3">V3</option>
- <option value="V4">V4</option>
- <option value="V5">V5</option>
- <option value="V6">V6</option>
+ <option value="V1">个体户</option>
+ <option value="V2">经销商</option>
+ <option value="V3">区代理</option>
+ <option value="V4">市代理</option>
+ <option value="V5">省代理</option>
+ <option value="V6">运营中心</option>
+ <option value="FANS">粉丝</option>
+ <option value="V_DIRECTOR">董事</option>
</select>
</div>
</div>
@@ -89,6 +91,13 @@
<input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchDirector">
{{# } else { }}
<input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
+ {{# } }}
+</script>
+<script type="text/html" id="switchPartner">
+ {{# if(d.partner === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchPartner">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchPartner">
{{# } }}
</script>
<style>
@@ -256,12 +265,14 @@
return '<span">普通会员</span>'
} else if (d.level === 'V_DIRECTOR') {
return '<span">董事</span>'
+ } else if (d.level === 'FANS') {
+ return '<span">粉丝</span>'
}else{
return ''
}
}, minWidth: 100,align:'center'},
// {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
- // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
+ {field: 'partner', title: '合伙人', templet:'#switchPartner', minWidth: 100},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -408,5 +419,13 @@
changeIdentityNo(1, data.value);
}
})
+
+ form.on('switch(switchPartner)', function (data) {
+ if (data.elem.checked) {
+ changeIdentityYes(3, data.value);
+ } else {
+ changeIdentityNo(3, data.value);
+ }
+ })
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1