From e20101aad3fadba31617ed4654f0ae0d31e45734 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jun 2023 11:28:13 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/enumerate/PoolEnum.java | 4 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 8 ++++
src/main/resources/templates/febs/views/dapp/money-change-flow.html | 51 +++++++++++++++++++------
3 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/PoolEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/PoolEnum.java
index 0326e2e..4417b42 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/PoolEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/PoolEnum.java
@@ -8,6 +8,10 @@
@Getter
public enum PoolEnum {
/**
+ * 系统买入ANDAO开关
+ */
+ SYSTEM("SYSTEM", "SYSTEM"),
+ /**
* AUSD互转20%
*/
ANDAO_MEMBER_TO_MENBER_PERCENT("WALLET_SET", "ANDAO_MEMBER_TO_MENBER_PERCENT"),
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index db4820f..5d6327c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -624,6 +624,14 @@
DappMemberEntity member = LoginUserUtil.getAppUser();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ DataDictionaryCustom systemStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PoolEnum.SYSTEM.getType(),
+ PoolEnum.SYSTEM.getCode()
+ );
+ String value = systemStateDic.getValue();
+ if("STOP".equals(value)){
+ throw new FebsException("功能升级中");
+ }
String upgrade = redisUtils.getString("APP_UPGRADE");
if ("upgrade".equals(upgrade)) {
throw new FebsException("功能升级中");
diff --git a/src/main/resources/templates/febs/views/dapp/money-change-flow.html b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
index 8315bf9..a4bddcb 100644
--- a/src/main/resources/templates/febs/views/dapp/money-change-flow.html
+++ b/src/main/resources/templates/febs/views/dapp/money-change-flow.html
@@ -21,18 +21,44 @@
<input type="text" placeholder="输入转账HASH" name="fromHash" autocomplete="off" class="layui-input">
</div>
</div>
-
-<!-- <div class="layui-inline">-->
-<!-- <label class="layui-form-label">类型：</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="type">-->
-<!-- <option value=""></option>-->
-<!-- <option value="1">购买节点</option>-->
-<!-- <option value="2">直推收益</option>-->
-<!-- <option value="3">收益</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">类型：</label>
+ <div class="layui-input-inline">
+ <select name="type">
+ <option value=""></option>
+ <option value="4">入金，买入A币</option>
+ <option value="5">进入a底池</option>
+ <option value="6">进入b底池</option>
+ <option value="7">50%客户秒到</option>
+ <option value="8">全网加权分红收益总量</option>
+ <option value="9">10%直推</option>
+ <option value="10">5%节点-(超级节点收益总量)</option>
+ <option value="11">5%节点平分</option>
+ <option value="12">5%基金会-(基金会收益总量)</option>
+ <option value="13">10%级差奖-(业绩奖收益总量)</option>
+ <option value="14">10%级差奖给会员</option>
+ <option value="15">dao3的全网分红</option>
+ <option value="16">dao4的全网分红</option>
+ <option value="17">dao5的全网分红</option>
+ <option value="18">dao5的平级全网分红</option>
+ <option value="19">DAO 3节点收益</option>
+ <option value="20">DAO 4节点收益</option>
+ <option value="21">DAO 5节点收益</option>
+ <option value="22">DAO 5平级收益</option>
+ <option value="23">资产钱包转账到闪对钱包</option>
+ <option value="24">资产钱包转账到闪对钱包手续费</option>
+ <option value="25">闪对钱包转USDT</option>
+ <option value="27">闪对钱包转USDT(USDT流水)</option>
+ <option value="28">入金，买入AUSD币</option>
+ <option value="29">每小时燃烧</option>
+ <option value="30">20%全网加权分红剩余</option>
+ <option value="31">AUSDT互转</option>
+ <option value="32">ANDAO互转</option>
+ <option value="33">权益额度增加</option>
+ <option value="34">进入提现池</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -83,6 +109,7 @@
31: {title: 'AUSDT互转', color: 'blue'},
32: {title: 'ANDAO互转', color: 'orange'},
33: {title: '权益额度增加', color: 'green'},
+ 34: {title: '进入提现池', color: 'green'},
}[d.type];
}}
<span class="layui-badge febs-bg-{{type.color}}">{{ type.title }}</span>
--
Gitblit v1.9.1