From 46dba54a3ce059624df67c97a29e2cc5c25fdc76 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 14:19:02 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 630 +++++++++++++++++----------------------------------------
1 files changed, 189 insertions(+), 441 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index d79840d..3aee8b3 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
@@ -12,17 +13,11 @@
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;
-import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
-import cc.mrbird.febs.dapp.vo.DappFundFlowVo;
-import cc.mrbird.febs.dapp.vo.DappMemberNodeVo;
-import cc.mrbird.febs.dapp.vo.WalletInfoVo;
+import cc.mrbird.febs.dapp.vo.*;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
@@ -122,115 +117,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 +342,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,114 +445,73 @@
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;
}
@Override
- public List<DappFundFlowVo> getRecordVoInPage(RecordInPageDto recordInPageDto) {
+ public IPage<DappFundFlowVo> getRecordVoInPage(RecordInPageDto recordInPageDto) {
Page<DappFundFlowVo> page = new Page<>(recordInPageDto.getPageNum(), recordInPageDto.getPageSize());
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -852,9 +519,10 @@
if (recordInPageDto.getType() != null && recordInPageDto.getType() != 0) {
dappFundFlowEntity.setType(recordInPageDto.getType());
}
+ dappFundFlowEntity.setFlowType(recordInPageDto.getFlowType());
dappFundFlowEntity.setMemberId(member.getId());
IPage<DappFundFlowVo> records = dappFundFlowDao.selectVoInPage(page, dappFundFlowEntity);
- return records.getRecords();
+ return records;
}
@Override
@@ -1016,4 +684,84 @@
// dappMemberEntity.getId());
// dappFundFlowDao.insert(aCoinCntFlowParent);
}
+
+ @Override
+ public FebsResponse withdrawAgree(Long id) {
+ DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+
+ if(FundFlowEnum.WITHDRAW_USDT.getCode() != dappFundFlowEntity.getType()){
+ return new FebsResponse().fail().message("该记录不存在");
+ }
+ if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
+ return new FebsResponse().fail().message("提现记录不是进行中状态");
+ }
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectByFlowId(dappMemberEntity.getId(),dappFundFlowEntity.getId());
+ if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
+ return new FebsResponse().fail().message("该记录不存在");
+ }
+ if(MemberCoinWithdrawEntity.STATUS_DOING != memberCoinWithdrawEntity.getStatus()){
+ return new FebsResponse().fail().message("提现记录不是进行中状态");
+ }
+ dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+ dappFundFlowDao.updateById(dappFundFlowEntity);
+
+ memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
+ memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+ memberCoinWithdrawDao.updateById(memberCoinWithdrawEntity);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse withdrawDisAgree(Long id) {
+ DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+
+ if(FundFlowEnum.WITHDRAW_USDT.getCode() != dappFundFlowEntity.getType()){
+ return new FebsResponse().fail().message("该记录不存在");
+ }
+ if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlowEntity.getStatus()){
+ return new FebsResponse().fail().message("提现记录不是进行中状态");
+ }
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(dappFundFlowEntity.getMemberId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectByFlowId(dappMemberEntity.getId(),dappFundFlowEntity.getId());
+ if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
+ return new FebsResponse().fail().message("该记录不存在");
+ }
+ if(MemberCoinWithdrawEntity.STATUS_DOING != memberCoinWithdrawEntity.getStatus()){
+ return new FebsResponse().fail().message("提现记录不是进行中状态");
+ }
+ dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_DISAGREE);
+ dappFundFlowDao.updateById(dappFundFlowEntity);
+
+ memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_NO);
+ memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+ memberCoinWithdrawDao.updateById(memberCoinWithdrawEntity);
+ //增加余额
+ this.updateWalletCoinWithLock(dappFundFlowEntity.getAmount().negate(), dappMemberEntity.getId(), 1);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse getChangeInPageInPage(ChangeInPageDto changeInPageDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Long memberId = member.getId();
+ changeInPageDto.setMemberId(memberId);
+ Page<DappAccountMoneyChangeEntity> page = new Page<>(changeInPageDto.getPageNum(), changeInPageDto.getPageSize());
+ IPage<DappAccountMoneyChangeEntity> memberMoneyFlowVos = dappAccountMoneyChangeDao.getChangeInPageInPage(page,changeInPageDto);
+ return new FebsResponse().success().data(memberMoneyFlowVos);
+ }
+
+ @Override
+ public FebsResponse changeInToday() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Long memberId = member.getId();
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = dappAccountMoneyChangeDao.selectNewOneByMemberId(memberId);
+ return new FebsResponse().success().data(dappAccountMoneyChangeEntity);
+ }
}
--
Gitblit v1.9.1