From 08181609f58ed88764960fcf2cfd37dd246fc297 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 14 Sep 2023 11:08:14 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/templates/febs/views/dapp/member.html | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 11 ++++++++---
src/main/resources/mapper/dapp/DappWalletCoinDao.xml | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index aac380e..4eb3c1d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -600,7 +600,12 @@
@Override
public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
- return dataDictionaryCustomMapper.getAgentLevelOption();
+ List<AdminAgentLevelOptionTreeVo> agentLevelOption = dataDictionaryCustomMapper.getAgentLevelOption();
+ AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVo = new AdminAgentLevelOptionTreeVo();
+ adminAgentLevelOptionTreeVo.setId("MEMBER");
+ adminAgentLevelOptionTreeVo.setName("MEMBER");
+ agentLevelOption.add(adminAgentLevelOptionTreeVo);
+ return agentLevelOption;
}
@Override
@@ -1331,7 +1336,7 @@
if(ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- dappMemberEntity.setChangeAble(1);
+ dappMemberEntity.setChangeAble(2);
dappMemberDao.updateById(dappMemberEntity);
return new FebsResponse().success();
}
@@ -1341,7 +1346,7 @@
if(ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- dappMemberEntity.setChangeAble(2);
+ dappMemberEntity.setChangeAble(1);
dappMemberDao.updateById(dappMemberEntity);
redisUtils.hdel(AppContants.REDIS_KEY_SIGN, dappMemberEntity.getAddress());
diff --git a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
index b337946..0cc388e 100644
--- a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
@@ -163,6 +163,7 @@
select IFNULL(sum(IFNULL(amount,0)),0)
from member_coin_withdraw
where 1=1
+ and status != 3
<if test='type == "D"'>
and date_format(CREATE_TIME, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d');
</if>
diff --git a/src/main/resources/templates/febs/views/dapp/member.html b/src/main/resources/templates/febs/views/dapp/member.html
index f5fcfde..6de3a26 100644
--- a/src/main/resources/templates/febs/views/dapp/member.html
+++ b/src/main/resources/templates/febs/views/dapp/member.html
@@ -59,7 +59,7 @@
<span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span>
</script>
<script type="text/html" id="switchChangeAble">
- {{# if(d.changeAble === 1) { }}
+ {{# if(d.changeAble === 2) { }}
<input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchChangeAble">
{{# } else { }}
<input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchChangeAble">
--
Gitblit v1.9.1