From 2ebe9fb8236ad9db3c156d03ac5fa9e2a633e557 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 Apr 2023 12:44:22 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
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 22df22c..62ab1ee 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
@@ -271,13 +271,13 @@
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_APPLY", mallAgentRecordAgree.getAgentLevel());
mallMemberVo.setAgentLevelName(dataDictionaryCustom.getDescription());
}
- if(mallAgentRecordAgree.getAgentLevel().equals("LEVEL_ONE")){
+ if(AgentLevelEnum.LEVEL_ONE.name().equals(mallAgentRecordAgree.getAgentLevel())){
mallMemberVo.setAgentLevel(1);
}
- if(mallAgentRecordAgree.getAgentLevel().equals("LEVEL_TWO")){
+ if(AgentLevelEnum.LEVEL_TWO.name().equals(mallAgentRecordAgree.getAgentLevel())){
mallMemberVo.setAgentLevel(2);
}
- if(mallAgentRecordAgree.getAgentLevel().equals("LEVEL_THREE")){
+ if(AgentLevelEnum.LEVEL_THREE.name().equals(mallAgentRecordAgree.getAgentLevel())){
mallMemberVo.setAgentLevel(3);
}
}else if(ObjectUtil.isNotEmpty(mallAgentRecordDisagree)){
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
index d309ef7..42b97e0 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
@@ -169,7 +169,7 @@
,{field:'createdTime', title:'申请时间', width:100,rowspan: 2,align: 'center'}
,{title: '操作',
templet: function (d) {
- if(d.state === 1 || d.agentLevelName === null){
+ if(d.state === 1){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>'
}else{
--
Gitblit v1.9.1