20221114，按日期查看资产

xiaoyong931011

2022-11-14 6ac0aeeea8834ad234623a321a64504a998c05d7

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

@@ -19,9 +19,7 @@
import cc.mrbird.febs.dapp.service.DappSystemService;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
import cc.mrbird.febs.dapp.vo.ApiMemberWalletCoinVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import cc.mrbird.febs.dapp.vo.*;
import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
@@ -630,11 +628,55 @@
        memberCoinWithdrawEntity.setFeeAmount(BigDecimal.ZERO);
        memberCoinWithdrawEntity.setSymbol("USDT");
        memberCoinWithdrawEntity.setMemberId(memberIdOut);
        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
        memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
        memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);

        usdtUpdateProducer.sendMemberCoinInside(memberCoinWithdrawEntity.getId());
//        usdtUpdateProducer.sendMemberCoinInside(memberCoinWithdrawEntity.getId());
        //转出账户，总额减少，冻结减少
        dappWalletCoinDao.delTotalAndDelFrozenById(dappWalletCoinEntityOut.getId(),balance);

        String isInside = memberCoinWithdrawEntity.getIsInside();
        String content = "";
        Integer type = 0;
        if(MemberCoinWithdrawEntity.ISINSIDE_NO.equals(isInside)){
            content = "提现";
            type = 2;
        }else{
            content = "转账";
            type = 4;
        }
        //转出账户生成一条账户资金变化记录
        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityOut = new DappAccountMoneyChangeEntity(memberIdOut,
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
                balance.negate(),
                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).subtract(balance),
                content,
                type);
        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityOut);

        //转入账户，总额增加，余额增加
        //转账
        if(MemberCoinWithdrawEntity.ISINSIDE_YES.equals(isInside)){
            String addressIn = memberCoinWithdrawEntity.getAddress();
            DappMemberEntity dappMemberEntityIn = dappMemberDao.selectMemberInfoByInviteId(addressIn);
            if(ObjectUtil.isEmpty(dappMemberEntityIn)){
                throw new FebsException(MessageSourceUtils.getString("Operation_002"));
            }
            DappWalletCoinEntity dappWalletCoinEntityIn = dappWalletCoinDao.selectByMemberId(dappMemberEntityIn.getId());
            Integer countIn = dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntityIn.getId(), memberCoinWithdrawEntity.getAmount());
            if(1 != countIn){
                throw new FebsException(MessageSourceUtils.getString("Operation_002"));
            }
            //生成流水记录
            DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityIn = new DappAccountMoneyChangeEntity(dappMemberEntityIn.getId(),
                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
                    balance,
                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).add(balance),
                    "转账",
                    4);
            dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityIn);
        }
        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
    }

@@ -1208,6 +1250,30 @@
        }
    }

    private final MemberCoinChargeDao memberCoinChargeDao;

    @Override
    public IPage<AdminMoneyTotalVo> moneyTotal(DappAccountMoneyChangeEntity record, QueryRequest request) {
        Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        //获取充值提现的所有日期
        IPage<AdminMoneyTotalVo> adminMoneyTotalVoIPage = dappAccountMoneyChangeDao.selectMoneyTotalInPage(record, page);
        List<AdminMoneyTotalVo> records = adminMoneyTotalVoIPage.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminMoneyTotalVo adminMoneyTotalVo : records){
                Date createTime = adminMoneyTotalVo.getCreateTime();
                //每日充值统计
                AdminMemberChargeVo adminMemberChargeVos = memberCoinChargeDao.selectTotalAmountByCreateTimeAndInviteId(createTime,record.getDescription());
                adminMoneyTotalVo.setTotalCharge(adminMemberChargeVos.getTotalCharge().setScale(2,BigDecimal.ROUND_DOWN));
                adminMoneyTotalVo.setSheetIn(adminMemberChargeVos.getSheetIn());
                //每日提现统计
                AdminMemberWithdrawVo adminMemberWithdrawVo = memberCoinWithdrawDao.selectTotalAmountByCreateTimeAndInviteId(createTime,record.getDescription());
                adminMoneyTotalVo.setTotalWithdraw(adminMemberWithdrawVo.getTotalWithdraw().setScale(2,BigDecimal.ROUND_DOWN));
                adminMoneyTotalVo.setSheetOut(adminMemberWithdrawVo.getSheetOut());
            }
        }
        return adminMoneyTotalVoIPage;
    }

    public static void main(String[] args) {

        DateTime date = DateUtil.date();