src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/dto/ChargeFeeDto.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/dto/PriceDto.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | ●●●●● patch | view | raw | blame | history | |
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | ●●●●● patch | view | raw | blame | history |
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -28,7 +28,7 @@ BSC_TFC("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2", "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836", "https://bsc-dataseed1.ninicoin.io", "0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2", "0x5dc091e47EDcd24709C7922370806d39e6Ad8be9", ""), /** src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -88,6 +88,18 @@ return new FebsResponse().success().data(dappWalletService.transfer(transferDto)); } @ApiOperation(value = "手续费充值", notes = "手续费充值") @PostMapping(value = "/chargeFee") public FebsResponse chargeFee(@RequestBody ChargeFeeDto chargeFeeDto) { return new FebsResponse().success().data(dappWalletService.chargeFee(chargeFeeDto)); } @ApiOperation(value = "手续费计算", notes = "手续费计算") @PostMapping(value = "/calPrice") public FebsResponse calPrice(@RequestBody PriceDto priceDto) { return new FebsResponse().success().data(dappWalletService.calPrice(priceDto)); } @ApiOperation(value = "记录列表", notes = "记录列表") @PostMapping(value = "/recordInPage") public FebsResponse recordInPage(@RequestBody RecordInPageDto recordInPageDto) { @@ -116,11 +128,5 @@ redisUtils.hdel(AppContants.REDIS_KEY_SIGN, member.getAddress()); redisUtils.hdel(AppContants.REDIS_KEY_MEMBER_INFO, member.getAddress()); return new FebsResponse().success(); } @ApiOperation(value = "计算手续费", notes = "计算手续费") @PostMapping(value = "/calPrice") public FebsResponse calPrice(@RequestBody PriceDto priceDto) { return new FebsResponse().success().data(dappWalletService.calPrice(priceDto)); } } src/main/java/cc/mrbird/febs/dapp/dto/ChargeFeeDto.java
New file @@ -0,0 +1,25 @@ package cc.mrbird.febs.dapp.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @Data @ApiModel(value = "ChargeFeeDto", description = "连接参数接收类") public class ChargeFeeDto { @ApiModelProperty(value = "id", example = "1") private Long id; @ApiModelProperty(value = "充值数量", example = "1") private BigDecimal amount; @ApiModelProperty(value = "success/fail", example = "success") private String flag; @ApiModelProperty(value = "交易hash", example = "123") private String txHash; } src/main/java/cc/mrbird/febs/dapp/dto/PriceDto.java
@@ -16,4 +16,7 @@ @ApiModelProperty(value = "价格", example = "1.0") private BigDecimal amount; @ApiModelProperty(value = "提现数量", example = "1.0") private BigDecimal withdrawCnt; } src/main/java/cc/mrbird/febs/dapp/entity/DappFundFlowEntity.java
@@ -54,6 +54,9 @@ * 16-复投 * 17-收益 * 18-买入 * 19-手续费充值 * 20-手续费扣除 * 21-提现 */ private Integer type; src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -4,6 +4,8 @@ @Getter public enum DataDictionaryEnum { //提现手续费率 CHARGE_FEE_PERCENT("CHARGE_FEE_PERCENT","CHARGE_FEE_PERCENT"), //直邀人数 INVITE_NUM("INVITE_NUM","INVITE_NUM"), // 奖励百分比 src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
@@ -51,4 +51,6 @@ FebsResponse nodeList(); MemberNodeVo memberNode(MemberNodeDto memberNodeDto); Long chargeFee(ChargeFeeDto chargeFeeDto); } src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
@@ -1,6 +1,5 @@ package cc.mrbird.febs.dapp.service.impl; import cc.mrbird.febs.common.contants.AppContants; import cc.mrbird.febs.common.utils.RedisUtils; import cc.mrbird.febs.dapp.chain.ChainEnum; import cc.mrbird.febs.dapp.chain.ChainService; @@ -8,12 +7,9 @@ import cc.mrbird.febs.dapp.chain.EthUsdtContract; import cc.mrbird.febs.dapp.entity.DappFundFlowEntity; import cc.mrbird.febs.dapp.entity.DappMemberEntity; import cc.mrbird.febs.dapp.entity.DappTransferRecordEntity; import cc.mrbird.febs.dapp.mapper.DappFundFlowDao; import cc.mrbird.febs.dapp.service.DappMemberService; import cc.mrbird.febs.dapp.service.DappWalletService; import cc.mrbird.febs.dapp.utils.OnlineTransferUtil; import cn.hutool.core.collection.CollUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,7 +19,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; import java.util.List; @Slf4j @Service @@ -48,19 +43,15 @@ @Transactional(rollbackFor = Exception.class) @Override public void compile(EthUsdtContract.TransferEventResponse e) { if (e.to != null && e.to.equals(ChainEnum.BSC_TFC.getAddress().toLowerCase())) { log.info("触发TFC监听"); if (e.to == null) { return; } // try { // Thread.sleep(5000); // } catch (InterruptedException ex) { // ex.printStackTrace(); // } redisUtils.set(AppContants.REDIS_KEY_BLOCK_COIN_NUM, e.log.getBlockNumber()); redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, e.log.getBlockNumber()); if ("0x0Ba249b2FAC0061dd9c388Bd607418E16490A3fd".toLowerCase().equals(e.to)) { log.info("触发GE手续费监听"); int decimals = ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(); // 更新余额 // 账户是否已经注册 DappMemberEntity fromMember = dappMemberService.findByAddress(e.from, null); if (fromMember == null) { return; @@ -69,32 +60,9 @@ BigInteger tokens = e.tokens; BigDecimal amount = new BigDecimal(tokens.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN); // 卖币 // 充值手续费 DappFundFlowEntity fundFlow = dappFundFlowDao.selectByFromHash(e.log.getTransactionHash(), null); if (fundFlow != null && fundFlow.getStatus() != 1) { return; } if (fundFlow == null) { List<DappFundFlowEntity> flows = dappFundFlowDao.selectFundFlowListByAddress(e.from, 1); if (CollUtil.isEmpty(flows)) { OnlineTransferUtil.addTransferRecord(e.from, e.to, amount, e.log.getTransactionHash(), DappTransferRecordEntity.TRANSFER_SOURCE_FLAG_ONLINE, AppContants.SYMBOL_COIN); log.info("本地无交易:{}", e.log.getTransactionHash()); return; } for (DappFundFlowEntity flow : flows) { if (flow.getStatus() == 1) { if (amount.compareTo(flow.getAmount()) == 0) { fundFlow = flow; fundFlow.setFromHash(e.log.getTransactionHash()); break; } } } } if (fundFlow == null) { return; } src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -5,8 +5,6 @@ import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.common.utils.RedisUtils; import cc.mrbird.febs.dapp.chain.ChainEnum; import cc.mrbird.febs.dapp.chain.ChainService; import cc.mrbird.febs.dapp.dto.*; import cc.mrbird.febs.dapp.entity.*; import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum; @@ -29,7 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -193,15 +190,29 @@ @Override public BigDecimal calPrice(PriceDto priceDto) { // String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE); DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode()); DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode()); BigDecimal amount = priceDto.getAmount(); if (priceDto.getAmount() == null) { amount = BigDecimal.ZERO; DappMemberEntity member = LoginUserUtil.getAppUser(); //手续费率 DataDictionaryCustom feePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( DataDictionaryEnum.CHARGE_FEE_PERCENT.getType(), DataDictionaryEnum.CHARGE_FEE_PERCENT.getCode()); BigDecimal feePercent = new BigDecimal(feePercentDic.getValue()).multiply(new BigDecimal("0.01")); //提现金额 BigDecimal withdrawCnt = BigDecimal.ZERO; if (ObjectUtil.isEmpty(priceDto.getWithdrawCnt())) { withdrawCnt = BigDecimal.ZERO; }else{ withdrawCnt = priceDto.getWithdrawCnt(); } return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 8, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP); if(BigDecimal.ZERO.compareTo(withdrawCnt) >= 0){ throw new FebsException("请输入正确的金额"); } DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId()); if (priceDto.getWithdrawCnt().compareTo(walletCoin.getAvailableAmount()) > 0) { throw new FebsException("可提现不足"); } BigDecimal feeUsdt = withdrawCnt.multiply(feePercent).setScale(2, BigDecimal.ROUND_DOWN); return feeUsdt.divide(priceDto.getAmount(), 2, BigDecimal.ROUND_DOWN); } @Override @@ -216,17 +227,17 @@ DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId()); if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) { throw new FebsException("DMD Not Enough"); throw new FebsException("Fee Not Enough"); } updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2); updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2); DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null); DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 20, 2, null, null); dappFundFlowDao.insert(feeFlow); DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null); DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 2, withdrawDto.getFee(), null); dappFundFlowDao.insert(fundFlow); MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity(); @@ -234,21 +245,11 @@ memberCoinWithdraw.setAddress(member.getAddress()); memberCoinWithdraw.setAmount(withdrawDto.getAmount()); memberCoinWithdraw.setFeeAmount(withdrawDto.getFee()); memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_YES); memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_DOING); memberCoinWithdraw.setSymbol("USDT"); memberCoinWithdraw.setFlowId(fundFlow.getId()); memberCoinWithdrawDao.insert(memberCoinWithdraw); String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount()); fundFlow.setToHash(hash); dappFundFlowDao.updateById(fundFlow); chainProducer.sendFeeDistributeMsg(fundFlow.getId()); // Map<String, Object> map = new HashMap<>(); // map.put("fee", withdrawDto.getFee()); // map.put("address", ChainEnum.BSC_TFC_FEE.getAddress()); // map.put("flow", feeFlow.getId()); // chainProducer.sendTfcFee(JSONObject.toJSONString(map)); } @Override @@ -501,6 +502,41 @@ return buildTeamMatrix(dbMemberNode); } @Override public Long chargeFee(ChargeFeeDto chargeFeeDto) { DappMemberEntity member = LoginUserUtil.getAppUser(); String upgrade = redisUtils.getString("APP_UPGRADE"); if ("upgrade".equals(upgrade)) { throw new FebsException("功能升级中"); } if (ObjectUtil.isEmpty(chargeFeeDto.getId())) {//第一次 DappFundFlowEntity fundFlow = new DappFundFlowEntity( member.getId(), chargeFeeDto.getAmount().negate(), 19, 1, BigDecimal.ZERO, chargeFeeDto.getTxHash()); dappFundFlowDao.insert(fundFlow); return fundFlow.getId(); } else {//第二次 DappFundFlowEntity flow = dappFundFlowDao.selectById(chargeFeeDto.getId()); if(ObjectUtil.isEmpty(flow)){ return null; } if ("success".equals(chargeFeeDto.getFlag())) { flow.setFromHash(chargeFeeDto.getTxHash()); dappFundFlowDao.updateById(flow); } else { if (flow.getStatus() == 1) { dappFundFlowDao.deleteById(chargeFeeDto.getId()); } } } return null; } public MemberNodeVo buildTeamMatrix(DbMemberNode dbMemberNode) { Long id = dbMemberNode.getId();