KKSU
2024-04-02 05b99c5f999575f6e4e8c211c09a927e757b9820
每人每日质押设置
9 files modified
45 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/DataDicEnum.java 6 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/AdminBannerController.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/dapp/member-money-flow.html 8 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/dapp/member.html 3 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/banner/coinPrice.html 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/banner/coinSet.html 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/DataDicEnum.java
@@ -27,9 +27,9 @@
    GFA_HUA_DIAN_WALLET_USDT_AMOUNT("GFA_HUA_DIAN_WALLET_USDT_AMOUNT","GFA滑点钱包的USDT数量"),//10
    GFA_HUA_DIAN_WALLET_COIN_AMOUNT("GFA_HUA_DIAN_WALLET_COIN_AMOUNT","GFA滑点钱包的GFA数量"),//10
    GFA_PRICE("GFA_PRICE","GFA代币价格"),//1
    GFA_COIN("GFA_COIN","代币名称"),//GFA
    USDT_COIN("USDT_COIN","代币名称"),//USDT
    GFA_PRICE("GFA_PRICE","GFA价格"),//1
    GFA_COIN("GFA_COIN","GFA名称"),//GFA
    USDT_COIN("USDT_COIN","GFA名称"),//USDT
    SYSTEM_START_FLAG("SYSTEM_START_FLAG","是否允许质押开关-start"),//start
    GFA_ZHUAN_ZHANG_KAI_GUAN("GFA_ZHUAN_ZHANG_KAI_GUAN","是否线上转账开关 1-开启 2-关闭"),//1
src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java
@@ -5,9 +5,9 @@
@Getter
public enum FlowTypeEnum {
    HUA_DIAN_TUANDUI_USDT(9,"滑点奖励USDT"),
    DAI_BI_OUT(8,"代币提现"),
    DAI_BI_OUT(8,"GFA提现"),
    USDT_OUT(7,"USDT提现"),
    HUA_DIAN_TUANDUI_DAIBI(6,"总业绩{},滑点奖励代币"),
    HUA_DIAN_TUANDUI_DAIBI(6,"总业绩{},滑点奖励GFA"),
    TUAN_DUI_FAIL(5,"奖励失效"),
    ZHIYA_CHA_CHU(4,"质押产币"),
    HUA_DIAN_GEREN(3,"质押{},滑点奖励"),
src/main/java/cc/mrbird/febs/dapp/controller/AdminBannerController.java
@@ -109,7 +109,7 @@
            return new FebsResponse().fail().message("请设置钱包USDT");
        }
        if(BigDecimal.ZERO.compareTo(coinAmount) > 0){
            return new FebsResponse().fail().message("请设置钱包代币");
            return new FebsResponse().fail().message("请设置钱包GFA");
        }
        dappSystemService.tradeProfitDistribute(1L);
        return new FebsResponse().success().message("操作成功");
src/main/java/cc/mrbird/febs/dapp/entity/DappMemberEntity.java
@@ -63,6 +63,8 @@
    private BigDecimal usdtBalance;
    private BigDecimal zhiYaAmount;
    /**
     * 激活状态 1-已激活 2-未激活
     */
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -188,7 +188,19 @@
        if (currentUser.getDeptId() == null) {
            member.setCurrentUser(currentUser.getUserId());
        }
        return dappMemberDao.selectInPage(member, page);
        IPage<DappMemberEntity> dappMemberEntityIPage = dappMemberDao.selectInPage(member, page);
        List<DappMemberEntity> records = dappMemberEntityIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(DappMemberEntity dappMemberEntity : records){
                QueryWrapper<DappAchieve> objectQueryWrapper = new QueryWrapper<>();
                objectQueryWrapper.eq("member_id",dappMemberEntity.getId());
                List<DappAchieve> dappAchieves = dappAchieveMapper.selectList(objectQueryWrapper);
                BigDecimal reduce = dappAchieves.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
                dappMemberEntity.setZhiYaAmount(reduce);
            }
        }
        return dappMemberEntityIPage;
    }
    @Override
src/main/resources/templates/febs/views/dapp/member-money-flow.html
@@ -17,9 +17,9 @@
                                                <option value="3">质押滑点奖励</option>
                                                <option value="4">质押产币</option>
                                                <option value="5">奖励失效</option>
                                                <option value="6">滑点奖励代币</option>
                                                <option value="6">滑点奖励GFA</option>
                                                <option value="7">USDT提现</option>
                                                <option value="8">代币提现</option>
                                                <option value="8">GFA提现</option>
                                                <option value="9">滑点奖励USDT</option>
                                            </select>
                                        </div>
@@ -89,11 +89,11 @@
    {{# } else if(d.type === 5) { }}
    <span class="layui-badge febs-bg-red">奖励失效</span>
    {{# } else if(d.type === 6) { }}
    <span class="layui-badge febs-bg-blue">滑点奖励代币</span>
    <span class="layui-badge febs-bg-blue">滑点奖励GFA</span>
    {{# } else if(d.type === 7) { }}
    <span class="layui-badge febs-bg-red">USDT提现</span>
    {{# } else if(d.type === 8) { }}
    <span class="layui-badge febs-bg-red">代币提现</span>
    <span class="layui-badge febs-bg-red">GFA提现</span>
    {{# } else if(d.type === 9) { }}
    <span class="layui-badge febs-bg-green">滑点奖励USDT</span>
    {{# } else { }}
src/main/resources/templates/febs/views/dapp/member.html
@@ -100,7 +100,8 @@
                    {field: 'address', title: '地址', minWidth: 400},
                    {field: 'inviteId', title: '邀请码', minWidth: 400},
                    {field: 'usdtBalance', title: '账户收益(USDT)', minWidth: 130},
                    {field: 'balance', title: '账户收益(代币)', minWidth: 130},
                    {field: 'balance', title: '账户收益(GFA)', minWidth: 130},
                    {field: 'zhiYaAmount', title: 'dapp质押总额', minWidth: 130},
                    {field: 'createTime', title: '创建时间', minWidth: 180},
                ]]
            });
src/main/resources/templates/febs/views/modules/banner/coinPrice.html
@@ -1,4 +1,4 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-coin-price" lay-title="代币价格">
<div class="layui-fluid layui-anim febs-anim" id="febs-coin-price" lay-title="GFA价格">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
src/main/resources/templates/febs/views/modules/banner/coinSet.html
@@ -1,4 +1,4 @@
<div class="layui-fluid layui-anim febs-anim" id="coin-set" lay-title="代币设置">
<div class="layui-fluid layui-anim febs-anim" id="coin-set" lay-title="GFA设置">
    <div class="layui-row layui-col-space8 febs-container">
        <form class="layui-form" action="" lay-filter="coin-set-form">
            <div class="layui-card">
@@ -138,7 +138,7 @@
                    <blockquote class="layui-elem-quote blue-border">滑点设置</blockquote>
                    <div class="layui-row layui-col-space10 layui-form-item">
                        <div class="layui-col-lg6">
                            <label class="layui-form-label febs-form-item-require">钱包代币:</label>
                            <label class="layui-form-label febs-form-item-require">钱包GFA:</label>
                            <div class="layui-input-block">
                                <input type="text" name="coinAmount" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                            </div>