20221021

xiaoyong931011

2022-10-31 cc559cd969d83865302011b5419b9f32f031ba98

20221021

 src/main/java/cc/mrbird/febs/common/utils/ShareCodeUtil.java

@@ -16,7 +16,9 @@
     * 自定义进制(0,1没有加入,容易与o,l混淆)
     */
//    private static final char[] r=new char[]{'q', 'w', 'e', '8', 'a', 's', '2', 'd', 'z', 'x', '9', 'c', '7', 'p', '5', 'i', 'k', '3', 'm', 'j', 'u', 'f', 'r', '4', 'v', 'y', 'l', 't', 'n', '6', 'b', 'g', 'h'};
    private static final char[] r = new char[]{'1', '2', '3', '4', '5', '6', '7', '8', '9'};
    private static final char[] r=new char[]{'q', 'w', 'e', 'a', 's', 'd', 'z', 'x', 'c', 'p',
            'i', 'k', 'm', 'j', 'u', 'f', 'r', 'v', 'y', 'l', 't', 'n', 'b', 'g', 'h'};
//    private static final char[] r = new char[]{'1', '2', '3', '4', '5', '6', '7', '8', '9'};

    /**
     * (不能与自定义进制有重复)

 src/main/java/cc/mrbird/febs/dapp/chain/BlockCoinServiceImpl.java

@@ -79,7 +79,7 @@
        // 添加冲币记录
        String orderNo = insertCoinCharge(address, memberId, amount, CoinTypeEnum.USDT.name(), "TRC20", BigDecimal.ZERO, hash);

        DappAccountMoneyChangeEntity accountMoneyChange = new DappAccountMoneyChangeEntity(memberId, amount, "充值", 9);
        DappAccountMoneyChangeEntity accountMoneyChange = new DappAccountMoneyChangeEntity(memberId, amount, "充值", 10);
        dappAccountMoneyChangeDao.insert(accountMoneyChange);
//        LogRecordUtils.insertMemberAccountMoneyChange(memberId, "转入", amount, CoinTypeEnum.USDT.name(), 1, 1);


 src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java

@@ -6,7 +6,7 @@
public enum DataDictionaryEnum {
    /**
     * 资金记录类型
     * 2-提现 4-内部转账 5-挂机收益 6-挂机 7-流水佣金 8-盈利分成 9-系统
     * 2-提现 4-内部转账 5-挂机收益 6-挂机 7-流水佣金 8-盈利分成 9-系统 10-充值
     */
    WITHDRAW_OUT("AMOUNT_TYPE","WITHDRAW_OUT"),
    WITHDRAW_INSIDE("AMOUNT_TYPE","WITHDRAW_INSIDE"),
@@ -14,6 +14,7 @@
    ONHOOK_RECORD("AMOUNT_TYPE","ONHOOK_RECORD"),
    RUNNING_COMMISION("AMOUNT_TYPE","RUNNING_COMMISION"),
    PROFIT_SHARING("AMOUNT_TYPE","PROFIT_SHARING"),
    SYSTEM_CHARGE("AMOUNT_TYPE","SYSTEM_CHARGE"),
    /**
     * 挂机设置
     * 最长挂机时间

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

@@ -126,7 +126,7 @@
        dappMember.setIsOnHook(1);
        dappMemberDao.updateById(dappMember);

        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, balance.negate()
                , availableAmount.subtract(balance).setScale(2,BigDecimal.ROUND_DOWN), "挂机", 6);
        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));

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

@@ -999,7 +999,7 @@
        }
        dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);

        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "系统拨付", 9);
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "充值", 10);
        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
        return new FebsResponse().success().message("操作成功");
    }

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

@@ -719,7 +719,7 @@
        //转出账户生成一条内部转账记录
        MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
        memberCoinWithdrawEntity.setAddress(address);
        memberCoinWithdrawEntity.setAmount(balance);
        memberCoinWithdrawEntity.setAmount(balance.negate());
        memberCoinWithdrawEntity.setFeeAmount(serviceFee);
        if(1 == apiTransferOutsideDto.getType()){
            memberCoinWithdrawEntity.setTag("银行卡");

 src/main/resources/mapper/dapp/DappMemberDao.xml

@@ -35,6 +35,9 @@
            <if test="record.inviteId != null and record.inviteId != ''">
                and a.invite_id = #{record.inviteId}
            </if>
            <if test="record.username != null and record.username != ''">
                and a.username like CONCAT('%',#{record.username},'%')
            </if>
        </where>
        order by create_time desc
    </select>

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

@@ -8,9 +8,9 @@
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">邀请码</label>
                                        <label class="layui-form-label layui-form-label-sm">用户名</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="inviteId" autocomplete="off" class="layui-input">
                                            <input type="text" name="username" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -365,7 +365,7 @@

        function getQueryParams() {
            return {
                inviteId: $searchForm.find('input[name="inviteId"]').val().trim(),
                username: $searchForm.find('input[name="username"]').val().trim(),
                changeAble: $searchForm.find("select[name='changeAble']").val(),
                accountStatus: $searchForm.find("select[name='accountStatus']").val(),
                withdrawAble: $searchForm.find("input[name='withdrawAble']").val(),