数据修改

xiaoyong931011

2023-08-12 5c4d462bbdce5aa68d4b6dc928a62256efe20d2a

数据修改

 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java

@@ -71,14 +71,6 @@
        return new FebsResponse().success().data(dappWalletService.getRecordVoInPage(recordInPageDto));
    }

    @ApiOperation(value = "买入A币", notes = "买入A币")
    @PostMapping(value = "/transferA")
    public FebsResponse transferA(@RequestBody TransferADto transferADto) {

//        return new FebsResponse().success().message("合约更新中");
        return new FebsResponse().success().data(dappWalletService.transferA(transferADto));
    }

    @ApiOperation(value = "兑换AUSDT", notes = "兑换AUSDT")
    @PostMapping(value = "/transferAusd")
    public FebsResponse transferAusd(@RequestBody TransferAusdDto transferAusdDto) {

 src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java

@@ -85,6 +85,12 @@
        return FebsUtil.view("dapp/member-withdraw");
    }

    @GetMapping("memberCharge")
    @RequiresPermissions("charge:view")
    public String memberCharge() {
        return FebsUtil.view("dapp/member-charge");
    }

    @GetMapping("walletCoin")
    @RequiresPermissions("walletCoin:view")
    public String walletCoin() {

 src/main/java/cc/mrbird/febs/dapp/dto/RecordInPageDto.java

@@ -20,4 +20,7 @@

    @ApiModelProperty(value = "类型", example = "1-买入 2-矩阵收益 3-直推收益 4-保险池 5-提现 6-手续费充值 7-手续费扣除 8-结算")
    private Integer type;

    @ApiModelProperty(value = "类型", example = "不传-全部 1-余额 2-积分")
    private Integer flowType;
}

 src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java

@@ -52,7 +52,19 @@
        this.toHash = toHash;
    }

    public DappFundFlowEntity(Integer flowType,Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash,Long systemProfitId) {
        this.flowType = flowType;
        this.memberId = memberId;
        this.amount = amount;
        this.type = type;
        this.status = status;
        this.fee = fee;
        this.fromHash = fromHash;
        this.systemProfitId = systemProfitId;
    }

    public DappFundFlowEntity(Long memberId, BigDecimal amount, Integer type, Integer status, BigDecimal fee, String fromHash,Long systemProfitId) {

        this.memberId = memberId;
        this.amount = amount;
        this.type = type;
@@ -92,6 +104,7 @@
     * 类型 1-认购节点 2-直推收益 3-技术方收款 4-入金，买入A币 5-进入a底池
     */
    private Integer type;
    private Integer flowType;

    /**
     * 状态 1-ing 2-成功 3-失败
@@ -121,4 +134,13 @@
     * 会员节点表ID-对应认购记录
     */
    private Long systemProfitId;

    public DappFundFlowEntity(int code, Long memberId, BigDecimal negate, int code1, int withdrawStatusAgree, BigDecimal zero) {
        this.flowType = code;
        this.memberId = memberId;
        this.amount = negate;
        this.type = code1;
        this.status = withdrawStatusAgree;
        this.fee = zero;
    }
}

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

@@ -6,6 +6,11 @@
public enum DataDictionaryEnum {

    /**
     *  提现手续费
     */
    WITHDRAW_FEE("WITHDRAW_FEE","WITHDRAW_FEE"),

    /**
     *  资产包USDT底池
     */
    PACKAGE_POOR("PACKAGE_POOR","PACKAGE_POOR"),

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

@@ -7,6 +7,10 @@
 */
@Getter
public enum FundFlowEnum {
    //提现
    WITHDRAW_USDT("WITHDRAW_USDT", 40),
    //充值
    CHARGE_USDT("CHARGE_USDT", 39),
    //全网加速V7
    ALL_PERK_V7("ALL_PERK_V7", 37),
    //全网加速V6

 src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java

@@ -42,8 +42,6 @@

    void transferAgain(TransferDto transferDto);

    Long transferA(TransferADto transferADto);

    /**
     * 资产钱包转帐到闪兑钱包3% 手续费（扣币）
     * @param mineToCoinDto

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

@@ -11,10 +11,7 @@
import cc.mrbird.febs.dapp.contract.andao.AndaoContractMain;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;
import cc.mrbird.febs.dapp.enumerate.PoolEnum;
import cc.mrbird.febs.dapp.enumerate.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
import cc.mrbird.febs.dapp.vo.*;
@@ -523,6 +520,10 @@

        DappWalletMineEntity dappWalletMineEntity = dappWalletMineDao.selectByMemberId(member.getId());
        dappMemberInfoVo.setScore(ObjectUtil.isEmpty(dappWalletMineEntity) ? BigDecimal.ZERO : dappWalletMineEntity.getTotalAmount());
        QueryWrapper<MallOrderInfo> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("status", 1);
        Integer selectCount = mallOrderInfoMapper.selectCount(objectQueryWrapper);
        dappMemberInfoVo.setWaitPayCnt(selectCount);
        return new FebsResponse().success().data(dappMemberInfoVo);
    }

@@ -748,6 +749,7 @@
         */
        dappWalletCoinDao.reduceTotalAndAvailableByMemberId(member.getId(),totalAmount);
        DappFundFlowEntity donateScoreFlow = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                member.getId(),
                totalAmount.negate(),
                FundFlowEnum.PAY_ORDER.getCode(),

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

@@ -2456,6 +2456,7 @@
        BigDecimal donateScore = amount.multiply(donateScorePercent);
        dappWalletMineDao.updateBalance(donateScore,donateScore,memberId);
        DappFundFlowEntity donateScoreFlow = new DappFundFlowEntity(
                AccountFlowEnum.SCORE.getCode(),
                memberId,
                donateScore,
                FundFlowEnum.DONATE_SCORE.getCode(),
@@ -3011,6 +3012,7 @@

            //插入积分流水
            DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
                    AccountFlowEnum.SCORE.getCode(),
                    memberId,
                    localTotalAchieve.negate(),
                    FundFlowEnum.REDUCE_SCORE_REAL.getCode(),
@@ -3041,6 +3043,7 @@
            dappAccountMoneyChangeDao.insert(addAmountAMC);
            //插入余额流水
            DappFundFlowEntity amountFlow = new DappFundFlowEntity(
                    AccountFlowEnum.AMOUNT.getCode(),
                    memberId,
                    localTotalAchieve,
                    FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
@@ -3278,29 +3281,35 @@
        }
        //生成一条静态补贴的流水
        DappFundFlowEntity realUsdtAmountFlow = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                parentMember.getId(),
                realScoreReduce,
                fundFlowEnumType,
                DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                BigDecimal.ZERO,
                null,
                orderId);
        dappFundFlowDao.insert(realUsdtAmountFlow);
        //插入积分流水
        DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
                AccountFlowEnum.SCORE.getCode(),
                parentMember.getId(),
                realScoreReduce.negate(),
                FundFlowEnum.REDUCE_SCORE.getCode(),
                DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                BigDecimal.ZERO,
                null,
                orderId);
        dappFundFlowDao.insert(scoreFlow);
        //插入余额流水
        DappFundFlowEntity amountFlow = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                parentMember.getId(),
                realScoreReduce,
                FundFlowEnum.ADD_AMOUNT.getCode(),
                DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
                BigDecimal.ZERO,
                null,
                orderId);
        dappFundFlowDao.insert(amountFlow);
        return realScoreReduce;

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

@@ -12,10 +12,7 @@
import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
import cc.mrbird.febs.dapp.enumerate.NodeCodeEnum;
import cc.mrbird.febs.dapp.enumerate.PoolEnum;
import cc.mrbird.febs.dapp.enumerate.*;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
@@ -122,115 +119,53 @@
         * 提币需要*当前a币价格，转换成USDT
         * A币卖币规则，卖出100%销毁，30%回流底池溢价
         */
//        DappMemberEntity member = LoginUserUtil.getAppUser();
//
//        DataDictionaryCustom systemStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.SYSTEM.getType(),
//                PoolEnum.SYSTEM.getCode()
//        );
//        String value = systemStateDic.getValue();
//        if("STOP".equals(value)){
//            throw new FebsException("Not yet open");
//        }
//        //提币数量
//        BigDecimal amount = withdrawDto.getAmount();
//        if(BigDecimal.ZERO.compareTo(amount) >= 0){
//            throw new FebsException("输入正确的数量");
//        }
//        DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
//        if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
//            throw new FebsException("可提现的数量不足");
//        }
//        DataDictionaryCustom aCoinPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.COIN_A_PRICE.getType(),
//                PoolEnum.COIN_A_PRICE.getCode()
//        );
//        BigDecimal coinAPrice = new BigDecimal(aCoinPriceDic.getValue());
//        //预计提现的USDT数量 = 币的数量 * 当前A币的价格
//        BigDecimal coinUsdtAmount = amount.multiply(coinAPrice);
//        /**
//         * 卖币可享有贡献值，鼓励卖币，例.卖出价值100U获得100贡献值
//         */
//        DappUsdtPerkEntity directDappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
//        if(ObjectUtil.isEmpty(directDappUsdtPerkEntity)){
//            directDappUsdtPerkEntity = new DappUsdtPerkEntity();
//            directDappUsdtPerkEntity.setNftDevote(coinUsdtAmount);
//            directDappUsdtPerkEntity.setMemberId(member.getId());
//            dappUsdtPerkEntityMapper.insert(directDappUsdtPerkEntity);
//        }
//
//        BigDecimal directNftDevote = directDappUsdtPerkEntity.getNftDevote();
//        directNftDevote = directNftDevote.add(coinUsdtAmount);
//        directDappUsdtPerkEntity.setNftDevote(directNftDevote);
//        dappUsdtPerkEntityMapper.updateById(directDappUsdtPerkEntity);
//
//        DataDictionaryCustom toUsdtPercentFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.WALLET_COIN_TO_USDT_PERCENT.getType(),
//                PoolEnum.WALLET_COIN_TO_USDT_PERCENT.getCode()
//        );
//        BigDecimal feePercent = new BigDecimal(toUsdtPercentFeeDic.getValue());
//        //手续费扣除USDT
//        BigDecimal feeUsdtAmount = coinUsdtAmount.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
//        //实际提现USDT数量,先扣除1%的手续费后，只到账70%
//
//        DataDictionaryCustom outPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.WALLET_COIN_OUT_PERCENT.getType(),
//                PoolEnum.WALLET_COIN_OUT_PERCENT.getCode()
//        );
//        BigDecimal outPercent = new BigDecimal(outPercentDic.getValue());
//        BigDecimal realUsdtAmount = coinUsdtAmount.subtract(feeUsdtAmount).setScale(4,BigDecimal.ROUND_DOWN);
//        BigDecimal realUsdtAmountFee = realUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//        realUsdtAmount = realUsdtAmount.subtract(realUsdtAmountFee);
//        //减少闪对钱包的币的数量
//        this.updateWalletCoinWithLock(amount, member.getId(), 2);
//        //增加流水
//        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(member.getId(), amount.negate(), FundFlowEnum.WALLET_COIN_TO_USDT.getCode(), 2, BigDecimal.ZERO);
//        dappFundFlowDao.insert(dappFundFlowEntity);
//        //增加流水
//        DappFundFlowEntity realUsdtAmountFlow = new DappFundFlowEntity(member.getId(), realUsdtAmount.negate(), FundFlowEnum.WALLET_COIN_TO_USDT_W.getCode(), 1, feeUsdtAmount);
//        dappFundFlowDao.insert(realUsdtAmountFlow);
//        //增加提现的记录
//        MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
//        memberCoinWithdraw.setMemberId(member.getId());
//        memberCoinWithdraw.setAddress(member.getAddress());
//        memberCoinWithdraw.setAmount(realUsdtAmount);
//        memberCoinWithdraw.setFeeAmount(feeUsdtAmount);
//        memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
//        memberCoinWithdraw.setSymbol("USDT");
//        memberCoinWithdraw.setFlowId(realUsdtAmountFlow.getId());
//        memberCoinWithdrawDao.insert(memberCoinWithdraw);
//        //发送提现消息
////        chainProducer.sendAntACoinOutMsg(realUsdtAmountFlow.getId());
//
//        /**
//         * A币卖币规则，卖出100%销毁，30%回流底池溢价
//         */
//        BigDecimal coinUsdtAmountFee = coinUsdtAmount.multiply(new BigDecimal(0.2)).setScale(4,BigDecimal.ROUND_DOWN);
////        coinUsdtAmount = coinUsdtAmount.multiply(outPercent).setScale(4,BigDecimal.ROUND_DOWN);
//        //金本位底池数量
//        DataDictionaryCustom coinAUsdtPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.COIN_A_USDT_PRICE.getType(),
//                PoolEnum.COIN_A_USDT_PRICE.getCode()
//        );
//        BigDecimal coinAUsdtCnt = new BigDecimal(coinAUsdtPriceDic.getValue());
//        coinAUsdtCnt = coinAUsdtCnt.subtract(coinUsdtAmount).add(coinUsdtAmountFee).setScale(4,BigDecimal.ROUND_DOWN);
//        coinAUsdtPriceDic.setValue(coinAUsdtCnt.toString());
//        dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
//        //币本位底池数量
//        DataDictionaryCustom coinACntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
//                PoolEnum.COIN_A_CNT.getType(),
//                PoolEnum.COIN_A_CNT.getCode()
//        );
//        BigDecimal coinACnt = new BigDecimal(coinACntDic.getValue());
//        coinACnt = coinACnt.subtract(amount).setScale(4,BigDecimal.ROUND_DOWN);
//        coinACntDic.setValue(coinACnt.toString());
//        dataDictionaryCustomMapper.updateById(coinACntDic);
//
//        coinAPrice = coinAUsdtCnt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
//        aCoinPriceDic.setValue(coinAPrice.toString());
//        dataDictionaryCustomMapper.updateById(aCoinPriceDic);
        DappMemberEntity member = LoginUserUtil.getAppUser();

//        chainProducer.sendAntKLineMsg(0);
        DataDictionaryCustom systemStateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                PoolEnum.SYSTEM.getType(),
                PoolEnum.SYSTEM.getCode()
        );
        String value = systemStateDic.getValue();
        if("STOP".equals(value)){
            throw new FebsException("Not yet open");
        }
        //提币数量
        BigDecimal amount = withdrawDto.getAmount();
        if(BigDecimal.ZERO.compareTo(amount) >= 0){
            throw new FebsException("输入正确的数量");
        }
        DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
        if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
            throw new FebsException("可提现的数量不足");
        }
        DataDictionaryCustom withdrawFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.WITHDRAW_FEE.getType(),
                DataDictionaryEnum.WITHDRAW_FEE.getCode()
        );
        BigDecimal withdrawFee = new BigDecimal(withdrawFeeDic.getValue());
        //手续费
        BigDecimal feeAmount = amount.multiply(withdrawFee);
        //减少余额
        this.updateWalletCoinWithLock(amount, member.getId(), 2);
        //增加流水
        DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity(
                AccountFlowEnum.AMOUNT.getCode(),
                member.getId(),
                amount.negate(),
                FundFlowEnum.WITHDRAW_USDT.getCode(),
                DappFundFlowEntity.WITHDRAW_STATUS_ING,
                feeAmount);
        dappFundFlowDao.insert(dappFundFlowEntity);
        //增加提现的记录
        MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
        memberCoinWithdraw.setMemberId(member.getId());
        memberCoinWithdraw.setAddress(member.getAddress());
        memberCoinWithdraw.setAmount(amount.subtract(feeAmount));
        memberCoinWithdraw.setFeeAmount(feeAmount);
        memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
        memberCoinWithdraw.setSymbol("USDT");
        memberCoinWithdraw.setFlowId(dappFundFlowEntity.getId());
        memberCoinWithdrawDao.insert(memberCoinWithdraw);
    }

    @Override
@@ -409,231 +344,6 @@

    }

    @Override
    public Long transferA(TransferADto transferADto) {
        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("Not yet open");
        }
        String upgrade = redisUtils.getString("APP_UPGRADE");
        if ("upgrade".equals(upgrade)) {
            throw new FebsException("功能升级中");
        }

//        if (transferADto.getType() != 2) {
//            member = dappMemberDao.selectById(member.getId());
//            if (member.getActiveStatus() == 1) {
//                throw new FebsException("Do not repeat purchase");
//            }
//        }
        /**
         * buyType=1,余额购买
         */
        if (transferADto.getBuyType() == 1) {
//            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
//            if (transferADto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
//                throw new FebsException("Balance Not Enough");
//            }
//
//            updateWalletCoinWithLock(transferADto.getAmount(), member.getId(), 2);
//
//            DappFundFlowEntity fundFlow = new DappFundFlowEntity(
//                    member.getId(),
//                    transferADto.getAmount().negate(),
//                    FundFlowEnum.BUY_A_COIN.getCode(),
//                    2,
//                    transferADto.getFee(),
//                    transferADto.getTxHash());
//            dappFundFlowDao.insert(fundFlow);
        } else {
            /**
             * buyType=2,钱包购买
             * 4:入金，买入A币
             */
//            int type = FundFlowEnum.BUY_A_COIN.getCode();
            int type = 4;
            // 1-认购 2-充值tfc
            if (transferADto.getType() == 2) {
                type = 6;
            }
            /**
             * 第一次请求，生成一条资金流水ID，并且返回。
             */
            if (transferADto.getId() == null) {
                /**
                 * 查询会员是否已经有正在进行中的入金记录
                 */
                DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
                if(ObjectUtil.isNotEmpty(fundFlowOld)){
                    //网络问题导致第二次提交前，未成功就关闭了页面
                    if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
                        dappFundFlowDao.deleteById(fundFlowOld.getId());
                        throw new FebsException("Refresh and try again");
                    }
                }
                /**
                 * 入金限制
                 *  每人总共入金100U
                 */
                BigDecimal amountIn = transferADto.getAmount();
//                if(amountIn.compareTo(new BigDecimal(100)) != 0){
//                    throw new FebsException("Limit per address 100 USDT");
//                }
                /**
                 * 每单金额得大于100 小于1000 限制
                 */
                if(amountIn.compareTo(new BigDecimal(100)) < 0){
                    throw new FebsException("Min 100");
                }
                if(amountIn.compareTo(new BigDecimal(100000)) > 0){
                    throw new FebsException("Max 100000");
                }

                BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
                if(!result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO)){
                    throw new FebsException("Please enter an integer multiple of 100");
                }

//                BigDecimal amountInLast = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
                /**
                 * 限制用户买入总额，
                 *  目前每人限一单，总金额限制100U
                 */
//                BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberId(member.getId());
                BigDecimal amountInLast = dappChargeUsdtMapper.selectBySumAmountMemberIdAndDate(member.getId(),DateUtil.today());
                /**
                 * 每个地址只能使用一次 限制总额1000U
                 */
                BigDecimal amountInAll = amountInLast.add(amountIn);
                if(getLocalAddress(dappMemberEntity.getAddress())){
                    if(amountInAll.compareTo(new BigDecimal(100000)) > 0){
                        BigDecimal add = new BigDecimal(100000).subtract(amountInLast).setScale(0, BigDecimal.ROUND_DOWN);
                        throw new FebsException("Max "+ add.toString());
                    }
                }
                /**
                 * 验证账户是否有入金金额的10%的AUSD
                 */
                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
                if(ObjectUtil.isEmpty(dappUsdtPerkEntity)){
                    dappUsdtPerkEntity = new DappUsdtPerkEntity();
                    dappUsdtPerkEntity.setMemberId(member.getId());
                    dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
                }
                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
                DataDictionaryCustom ausdPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        PoolEnum.TRANSFER_A_AUSD_PERCENT.getType(),
                        PoolEnum.TRANSFER_A_AUSD_PERCENT.getCode()
                );
                BigDecimal ausdPercent = new BigDecimal(ausdPercentDic.getValue());
                BigDecimal ausdPercentUsdt = transferADto.getAmount().multiply(ausdPercent);

                DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),
                        PoolEnum.TRANSFER_A_AUSD_PRICE.getCode()
                );
                BigDecimal ausdPrice = new BigDecimal(ausdPriceDic.getValue());
                BigDecimal ausdAmountNeed = ausdPercentUsdt.divide(ausdPrice);
                if(BigDecimal.ZERO.compareTo(ausdAmount) >= 0){
                    throw new FebsException("AUSDT数量不足");
                }
                if(ausdAmountNeed.compareTo(ausdAmount) > 0){
                    throw new FebsException("AUSDT数量不足");
                }
                /**
                 * 出局复投要求等于戓大于自己上次投资金额
                 */
                BigDecimal maxAmount = dappChargeUsdtMapper.selectByMaxAmountMemberId(member.getId());
                if(maxAmount.compareTo(transferADto.getAmount()) > 0){
                    throw new FebsException("投资金额不能小于"+maxAmount.setScale(4,BigDecimal.ROUND_DOWN));
                }
                //生成一条进行中的入金资金流水记录
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
                        member.getId(),
                        transferADto.getAmount(),
                        type,
                        1,
                        ausdAmountNeed,
                        transferADto.getTxHash());


//                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
//                        member.getId(),
//                        transferADto.getAmount(),
//                        type,
//                        1,
//                        new BigDecimal("1"),
//                        transferADto.getTxHash());
                dappFundFlowDao.insert(fundFlow);
                return fundFlow.getId();
            }

            if ("success".equals(transferADto.getFlag())) {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferADto.getId());
                if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
                    throw new FebsException("请勿重复提交");
                }

                /**
                 * 链上转账的hash值
                 */
                flow.setFromHash(transferADto.getTxHash());
                dappFundFlowDao.updateById(flow);
//                /**
//                 * 生成会员入金买A币的记录
//                 */
//                DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity(
//                        member.getId(),
//                        dappMemberEntity.getAddress(),
//                        transferADto.getTxHash(),
//                        2,
//                        transferADto.getAmount(),
//                        BigDecimal.ZERO,
//                        BigDecimal.ZERO);
//                dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
//                /**
//                 * 减少用户的AUSD数量
//                 */
//                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
//                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
//                ausdAmount = ausdAmount.subtract(flow.getFee()).setScale(4,BigDecimal.ROUND_DOWN);
//                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
//                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
//                /**
//                 * 流水关联用户购买记录
//                 */
//                flow.setSystemProfitId(dappChargeUsdtEntity.getId());
//                /**
//                 * 链上转账的hash值
//                 */
//                flow.setFromHash(transferADto.getTxHash());
//                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
//                dappFundFlowDao.updateById(flow);
//                /**
//                 * 发送消息处理返利逻辑
//                 */
//                chainProducer.sendAntACoinInMsg(flow.getId());
//                /**
//                 * 发送消息处理代理升级
//                 */
//                chainProducer.sendAntMemberLevelMsg(member.getId());
            } else {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferADto.getId());
                if (flow.getStatus() == 1) {
                    dappFundFlowDao.deleteById(transferADto.getId());
                }
            }
        }
        return null;
    }

    public boolean getLocalAddress(String address){
        /**
         * dappMemberEntity.getAddress().equals("0x2bBAD0d2362a8dbdc655fBa5A0cd51d5379e38f7")
@@ -737,107 +447,66 @@
            throw new FebsException("功能升级中");
        }

//        if (transferAusdDto.getType() != 2) {
//            member = dappMemberDao.selectById(member.getId());
//            if (member.getActiveStatus() == 1) {
//                throw new FebsException("Do not repeat purchase");
//            }
//        }
        /**
         * buyType=1,余额购买
         * 充值
         */
        if (transferAusdDto.getBuyType() == 1) {
//            DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
//            if (transferAusdDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
//                throw new FebsException("Balance Not Enough");
//            }
//
//            updateWalletCoinWithLock(transferAusdDto.getAmount(), member.getId(), 2);
//
//            DappFundFlowEntity fundFlow = new DappFundFlowEntity(
//                    member.getId(),
//                    transferAusdDto.getAmount().negate(),
//                    FundFlowEnum.BUY_AUSD_COIN.getCode(),
//                    2,
//                    transferAusdDto.getFee(),
//                    transferAusdDto.getTxHash());
//            dappFundFlowDao.insert(fundFlow);
        int type = FundFlowEnum.CHARGE_USDT.getCode();
        /**
         * 第一次请求，生成一条资金流水ID，并且返回。
         */
        if (transferAusdDto.getId() == null) {
            /**
             * 查询会员是否已经有正在进行中的入金记录
             */
            DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(dappMemberEntity.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
            if(ObjectUtil.isNotEmpty(fundFlowOld)){
                //网络问题导致第二次提交前，未成功就关闭了页面
                if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
                    dappFundFlowDao.deleteById(fundFlowOld.getId());
                    throw new FebsException("Refresh and try again");
                }
            }
            //生成一条进行中的入金资金流水记录
            DappFundFlowEntity fundFlow = new DappFundFlowEntity(
                    dappMemberEntity.getId(),
                    transferAusdDto.getAmount(),
                    type,
                    1,
                    transferAusdDto.getFee(),
                    transferAusdDto.getTxHash());
            dappFundFlowDao.insert(fundFlow);
            return fundFlow.getId();
        }

        DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
        if ("success".equals(transferAusdDto.getFlag())) {
            if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
                throw new FebsException("请勿重复提交");
            }
            /**
             * 链上转账的hash值
             */
            flow.setFlowType(AccountFlowEnum.AMOUNT.getCode());
            flow.setFromHash(transferAusdDto.getTxHash());
            flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
            dappFundFlowDao.updateById(flow);
            BigDecimal amount = transferAusdDto.getAmount();
            /**
             * 增加用户的余额
             */
            dappWalletCoinDao.addTotalAndaddAvailableByMemberId(member.getId(),amount);

            DappChargeUsdtEntity dappChargeUsdtEntity = new DappChargeUsdtEntity();
            dappChargeUsdtEntity.setMemberId(member.getId());
            dappChargeUsdtEntity.setMemberAddress(member.getAddress());
            dappChargeUsdtEntity.setMemberHash(transferAusdDto.getTxHash());
            dappChargeUsdtEntity.setStatus(2);
            dappChargeUsdtEntity.setTotalCnt(amount);
            dappChargeUsdtEntity.setRealCnt(amount);
            dappChargeUsdtMapper.insert(dappChargeUsdtEntity);
        } else {
            /**
             * buyType=2,钱包购买
             * 4:入金，买入A币
             */
            int type = 4;
            // 1-认购 2-充值tfc
            if (transferAusdDto.getType() == 2) {
                type = 6;
            }
            /**
             * 第一次请求，生成一条资金流水ID，并且返回。
             */
            if (transferAusdDto.getId() == null) {
                /**
                 * 查询会员是否已经有正在进行中的入金记录
                 */
                DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
                if(ObjectUtil.isNotEmpty(fundFlowOld)){
                    //网络问题导致第二次提交前，未成功就关闭了页面
                    if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
                        dappFundFlowDao.deleteById(fundFlowOld.getId());
                        throw new FebsException("Refresh and try again");
                    }
                }
                //生成一条进行中的入金资金流水记录
                DappFundFlowEntity fundFlow = new DappFundFlowEntity(
                        member.getId(),
                        transferAusdDto.getAmount(),
                        type,
                        1,
                        transferAusdDto.getFee(),
                        transferAusdDto.getTxHash());
                dappFundFlowDao.insert(fundFlow);
                return fundFlow.getId();
            }

            if ("success".equals(transferAusdDto.getFlag())) {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
                if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
                    throw new FebsException("请勿重复提交");
                }
                /**
                 * 增加用户的AUSD数量
                 */
                BigDecimal amount = transferAusdDto.getAmount();
                DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),
                        PoolEnum.TRANSFER_A_AUSD_PRICE.getCode()
                );
                BigDecimal ausdPrice = new BigDecimal(ausdPriceDic.getValue());
                BigDecimal ausdCnt = amount.divide(ausdPrice, 4, BigDecimal.ROUND_DOWN);

                DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(member.getId());
                if(ObjectUtil.isEmpty(dappUsdtPerkEntity)){
                    dappUsdtPerkEntity = new DappUsdtPerkEntity();
                    dappUsdtPerkEntity.setMemberId(member.getId());
                    dappUsdtPerkEntity.setAmount(BigDecimal.ZERO);
                    dappUsdtPerkEntity.setAusdAmount(BigDecimal.ZERO);
                    dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
                }
                BigDecimal ausdAmount = dappUsdtPerkEntity.getAusdAmount();
                ausdAmount = ausdAmount.add(ausdCnt).setScale(4,BigDecimal.ROUND_DOWN);
                dappUsdtPerkEntity.setAusdAmount(ausdAmount);
                dappUsdtPerkEntityMapper.updateById(dappUsdtPerkEntity);
                /**
                 * 链上转账的hash值
                 */
                flow.setFromHash(transferAusdDto.getTxHash());
                flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
                dappFundFlowDao.updateById(flow);
            } else {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferAusdDto.getId());
                if (flow.getStatus() == 1) {
                    dappFundFlowDao.deleteById(transferAusdDto.getId());
                }
            if (flow.getStatus() == 1) {
                dappFundFlowDao.deleteById(transferAusdDto.getId());
            }
        }
        return null;

 src/main/java/cc/mrbird/febs/dapp/vo/DappMemberInfoVo.java

@@ -33,4 +33,8 @@
    @ApiModelProperty(value = "资产")
    private BigDecimal balance;

    //商品名称
    @ApiModelProperty(value = "待支付角标")
    private Integer waitPayCnt;

}

 src/main/java/cc/mrbird/febs/dapp/vo/MallOrderListVo.java

@@ -49,6 +49,12 @@
    @ApiModelProperty(value = "取消类型;1-超时未支付2-主动取消")
    private Integer cancelType;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "商品数量")
    private String goodsCnt;

    /**
     * 订单类型 1-普通订单 2-积分订单
     */

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

@@ -47,6 +47,9 @@
            <if test="record.status != null">
                and a.status = #{record.status}
            </if>
            <if test="record.flowType != null">
                and a.flow_type = #{record.flowType}
            </if>
        </where>
        order by a.create_time desc
    </select>

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

@@ -273,8 +273,11 @@
    </select>

    <select id="selectMallOrderListQueryInPage" resultType="cc.mrbird.febs.dapp.vo.MallOrderListVo">
        select a.*
        select a.*,
               b.goods_name goodsName,
               b.cnt goodsCnt
        from mall_order_info a
        left join mall_order_item b on a.id = b.order_id
        <where>
            a.member_id = #{record.memberId}
            <if test="record != null">

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

New file
@@ -0,0 +1,123 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-charge" lay-title="充值记录">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="withdraw-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                    <div class="layui-inline">
                                        <div class="layui-input-inline">
                                            <input type="text" name="address" autocomplete="off" placeholder="输入地址或邀请码" class="layui-input">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">状态：</label>
                                        <div class="layui-input-inline">
                                            <select name="status">
                                                <option value=""></option>
                                                <option value="1">进行中</option>
                                                <option value="2">成功</option>
                                                <option value="3">失败</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="chargeTable" lay-data="{id: 'chargeTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<style>
    .layui-table-cell {
        height: auto !important;
    }
</style>
<script type="text/html" id="charge-status">
    {{#
    var status = {
    1: {title: '进行中'},
    2: {title: '成功'},
    3: {title: '失败'}
    }[d.status];
    }}
    <span>{{ status.title }}</span>
</script>
<script data-th-inline="none" type="text/javascript">
    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
        var $ = layui.jquery,
            laydate = layui.laydate,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            dropdown = layui.dropdown,
            $view = $('#febs-charge'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'createTime', type: null},
            tableIns;

        form.render();

        initTable();

        table.on('sort(chargeTable)', function (obj) {
            sortObject = obj;
            tableIns.reload({
                initSort: obj,
                where: $.extend(getQueryParams(), {
                    field: obj.field,
                    order: obj.type
                })
            });
        });

        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        $reset.on('click', function () {
            $searchForm[0].reset();
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'chargeTable',
                url: ctx + 'flow/fundFlow?type=39',
                totalRow: true ,// 开启合计行
                cols: [[
                    {field: 'address', title: '地址', minWidth: 130, totalRowText: '合计：'},
                    {field: 'createTime', title: '创建时间', minWidth: 180},
                    {field: 'amount', title: '充值金额(USDT)', minWidth: 130,totalRow: '{{= parseInt(d.amount) }}'},
                    {title: '状态', templet: '#charge-status'},
                ]]
            });
        }

        function getQueryParams() {
            return {
                address: $searchForm.find('input[name="address"]').val().trim(),
                status: $searchForm.find("select[name='status']").val(),
                invalidate_ie_cache: new Date()
            };
        }

    })
</script>

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

@@ -128,11 +128,12 @@
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'withdrawTable',
                url: ctx + 'flow/fundFlow?type=2',
                url: ctx + 'flow/fundFlow?type=40',
                totalRow: true ,// 开启合计行
                cols: [[
                    {field: 'address', title: '地址', minWidth: 130},
                    {field: 'address', title: '地址', minWidth: 130, totalRowText: '合计：'},
                    {field: 'createTime', title: '创建时间', minWidth: 180},
                    {field: 'amount', title: '提现金额(USDT)', minWidth: 130},
                    {field: 'amount', title: '提现金额(USDT)', minWidth: 130,totalRow: '{{= parseInt(d.amount) }}'},
                    {title: '提现状态', templet: '#withdraw-status'},
                    {field: 'fee', title: '手续费', minWidth: 130},
                    {title: '操作', toolbar: '#withdraw-option', minWidth: 200}