xiaoyong931011
2023-03-24 5615f6bf82593370b0e7b1a903399bd5c84b18df
src/main/java/cc/mrbird/febs/mall/chain/job/NotionalPoolingJob.java
@@ -72,7 +72,7 @@
        for (Object address : poolAddress) {
            String next = (String) address;
            log.info("归集地址:{}", next);
//            log.info("归集地址:{}", next);
            //查询USDT余额
            MemberCoinAddressEntity memberCoinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(next, "USDT", "ERC20");
            if(ObjectUtil.isEmpty(memberCoinAddressEntity)){
@@ -95,28 +95,28 @@
                    memberCoinAddressEntity.getAddress(),
                    AppContants.ERC20_POOL_ADDRESS,
                    balanceOf.toString());
            if(StrUtil.isNotEmpty(transfer)){
                Long memberId = memberCoinAddressEntity.getMemberId();
                // 查询钱包 并更新
                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
                if (mallMemberWallet == null) {
                    return;
                }
                mallMemberWalletMapper.updateBlockBalanceById(mallMemberWallet.getId(), balanceOf.setScale(4, BigDecimal.ROUND_DOWN));
                String orderNo = insertCoinCharge(next, memberId, balanceOf.setScale(4, BigDecimal.ROUND_DOWN), CoinTypeEnum.USDT.name(), "ERC20", BigDecimal.ZERO);
                Long chargeFlowId = mallMoneyFlowService.addMoneyFlow(
                        memberId,
                        orderNo,
                        balanceOf.setScale(4, BigDecimal.ROUND_DOWN),
                        MallMoneyFlowTypeEnum.CHARGE.getCode(),
                        MallMoneyFlow.STATUS_SUCCESS,
                        MallMoneyFlow.IS_RETURN_Y,
                        memberId,
                        FlowTypeEnum.BALANCE.getValue(),
                        MallMoneyFlowTypeEnum.CHARGE.getName()
                );
            }
//            if(StrUtil.isNotEmpty(transfer)){
//                Long memberId = memberCoinAddressEntity.getMemberId();
//                // 查询钱包 并更新
//                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
//                if (mallMemberWallet == null) {
//                    return;
//                }
//                mallMemberWalletMapper.updateBlockBalanceById(mallMemberWallet.getId(), balanceOf.setScale(4, BigDecimal.ROUND_DOWN));
//
//                String orderNo = insertCoinCharge(next, memberId, balanceOf.setScale(4, BigDecimal.ROUND_DOWN), CoinTypeEnum.USDT.name(), "ERC20", BigDecimal.ZERO);
//                Long chargeFlowId = mallMoneyFlowService.addMoneyFlow(
//                        memberId,
//                        orderNo,
//                        balanceOf.setScale(4, BigDecimal.ROUND_DOWN),
//                        MallMoneyFlowTypeEnum.CHARGE.getCode(),
//                        MallMoneyFlow.STATUS_SUCCESS,
//                        MallMoneyFlow.IS_RETURN_Y,
//                        memberId,
//                        FlowTypeEnum.BALANCE.getValue(),
//                        MallMoneyFlowTypeEnum.CHARGE.getName()
//                );
//            }
        }
    }
@@ -157,7 +157,7 @@
        for (Object address : poolAddress) {
            String next = (String) address;
            log.info("归集地址:{}", next);
//            log.info("归集地址:{}", next);
            //查询USDT余额
            MemberCoinAddressEntity memberCoinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(next, "USDT", "ERC20");
            if(ObjectUtil.isEmpty(memberCoinAddressEntity)){