20221130

xiaoyong931011

2022-12-05 34efa2ca14f6ec35a71b33291a62e53ba691dfb2

20221130

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java

@@ -463,18 +463,19 @@
            return;
        }
        Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
//        if(count > 0){
//        //金额
//        BigDecimal amount = dappFundFlowEntity.getAmount();
//        //目标地址
//        String address = dappMemberEntity.getAddress();
        if(count > 0){
        //金额
        BigDecimal amount = dappFundFlowEntity.getAmount();
        //目标地址
        String address = dappMemberEntity.getAddress();
//        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
//        if(StrUtil.isEmpty(hash)){
//            return;
//        }
//        dappFundFlowEntity.setToHash(hash);
//        dappFundFlowDao.updateById(dappFundFlowEntity);
//        }
        String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
        if(StrUtil.isEmpty(hash)){
            return;
        }
        dappFundFlowEntity.setToHash(hash);
        dappFundFlowDao.updateById(dappFundFlowEntity);
        }
    }

    @Override

 src/main/resources/templates/febs/views/dapp/member-teamInfo.html

@@ -42,7 +42,7 @@
                    {field: 'directCnt', title: '直推数量', minWidth: 100, totalRow: true},
                    {field: 'directProfit', title: '直推收益', minWidth: 100, totalRow: true},
                    {field: 'levelProfit', title: '层级收益', minWidth: 100, totalRow: true},
                    {field: 'luckyProfit', title: '动能收益', minWidth: 100, totalRow: true}
                    {field: 'luckyProfit', title: '出局收益', minWidth: 100, totalRow: true}
                ]]
            });
        }

 src/main/resources/templates/febs/views/dapp/money-change-flow.html

@@ -34,7 +34,7 @@
                                                <option value="4">层级收益</option>
                                                <option value="5">剩余层级收益</option>
                                                <option value="6">复投动能</option>
                                                <option value="7">动能收益</option>
                                                <option value="7">出局收益</option>
                                            </select>
                                        </div>
                                    </div>
@@ -100,7 +100,7 @@
    4: {title: '层级收益'},
    5: {title: '剩余层级收益'},
    6: {title: '复投动能'},
    7: {title: '动能收益'},
    7: {title: '出局收益'},
    }[d.type];
    }}
    <span>{{ type.title }}</span>
@@ -137,11 +137,11 @@
        table.on('tool(moneyChangeTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'transferManual') {
                febs.modal.confirm('人工操作', '是否人工转账？', function () {
                    transferManual("flow/withdrawAgree/" + data.id);
                });
            }
            // if (layEvent === 'transferManual') {
            //     febs.modal.confirm('人工操作', '是否人工转账？', function () {
            //         transferManual("flow/withdrawAgree/" + data.id);
            //     });
            // }
            if (layEvent === 'transferManual') {
                febs.modal.confirm('人工操作', '是否人工转账？', function () {
                    transferManual(data.id);

 src/main/resources/templates/febs/views/dapp/system-profit-flow.html

@@ -33,7 +33,7 @@
    4: {title: '层级收益'},
    5: {title: '剩余层级收益'},
    6: {title: '复投动能'},
    7: {title: '动能收益'},
    7: {title: '出局收益'},
    }[d.type];
    }}
    <span>{{ type.title }}</span>