From e9e2905bfc18dd68562f9e9711ce60f67ec28aa7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Oct 2022 16:05:28 +0800
Subject: [PATCH] 20221020
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 323 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 282 insertions(+), 41 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 29df640..dd421d1 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,16 +13,22 @@
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.mapper.*;
+import cc.mrbird.febs.dapp.service.DappMemberService;
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 cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -54,6 +61,8 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappSystemService dappSystemService;
private final DappNftActivationDao dappNftActivationDao;
+ private final DappMemberService dappMemberService;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
@Override
public WalletInfoVo walletInfo() {
@@ -235,6 +244,9 @@
// 铸池中的币的剩余量
BigDecimal makeCoinRemain = (BigDecimal) redisUtils.get(AppContants.REDIS_KEY_MAKE_POOL_CNT);
+ DateTime tomorrow = DateUtil.beginOfDay(DateUtil.tomorrow());
+ long time = DateUtil.between(new Date(), tomorrow, DateUnit.SECOND, true);
+
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (transferDto.getId() == null) {
if (DappFundFlowEntity.TYPE_SALE == transferDto.getType()) {
@@ -242,21 +254,21 @@
throw new FebsException(MessageSourceUtils.getString("transfer_msg_001"));
}
- if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
- throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
- }
-
- if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
- throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
- }
-
- usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
- saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
-
- // 修改当日U剩余量
- redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
- // 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+// if (transferDto.getAmount().multiply(transferDto.getPrice()).compareTo(usdtRemain) > 0) {
+// throw new FebsException(MessageSourceUtils.getString("transfer_msg_002"));
+// }
+//
+// if (transferDto.getAmount().compareTo(saleCoinRemain) > 0) {
+// throw new FebsException(MessageSourceUtils.getString("transfer_msg_003"));
+// }
+//
+// usdtRemain = usdtRemain.subtract(transferDto.getAmount().multiply(transferDto.getPrice()));
+// saleCoinRemain = saleCoinRemain.subtract(transferDto.getAmount());
+//
+// // 修改当日U剩余量
+// redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
+// // 修改用户24小时可售量
+// redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain, time);
} else if (DappFundFlowEntity.TYPE_BUY == transferDto.getType()) {
// 购买时，前端传来的amount是USDT，卖出amount是TFC
BigDecimal usdtAmount = transferDto.getAmount();
@@ -289,8 +301,9 @@
makeCoinRemain = makeCoinRemain.subtract(transferDto.getAmount());
buyUsdtMax = buyUsdtMax.subtract(usdtAmount);
+
// 修改每日最大购买USDT量
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
@@ -328,7 +341,7 @@
// 修改铸池量
redisUtils.set(AppContants.REDIS_KEY_MAKE_POOL_CNT, makeCoinRemain);
- redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax);
+ redisUtils.set(AppContants.REDIS_KEY_IDO_USDT_MAX_BUY_DAILY + member.getAddress(), buyUsdtMax, time);
}
} else {
usdtRemain = usdtRemain.add(transferDto.getAmount().multiply(transferDto.getPrice()));
@@ -337,7 +350,7 @@
// 修改当日U剩余量
redisUtils.set(AppContants.REDIS_KEY_USDT_OUT_LIMIT_REMAIN, usdtRemain);
// 修改用户24小时可售量
- redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain);
+ redisUtils.set(AppContants.REDIS_KEY_COIN_REMAIN + member.getAddress(), saleCoinRemain, time);
}
dappFundFlowDao.deleteById(transferDto.getId());
}
@@ -366,7 +379,7 @@
BigDecimal x = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
BigDecimal y = sourceU.divide(sourceCoin.add(coin), tfcInstance.decimals(), RoundingMode.HALF_UP);
- log.info("购买价格:{}, 出卖价格:{}", x, y);
+// log.info("购买价格:{}, 出卖价格:{}", x, y);
HashMap<String, BigDecimal> map = new HashMap<>();
map.put("x", x);
map.put("y", y);
@@ -387,25 +400,8 @@
BoxUtil.Box box = BoxUtil.openBox();
-// DappFundFlowEntity boxFundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(box.getIndex()), 6, 2, BigDecimal.ZERO);
-// dappFundFlowDao.insert(boxFundFlow);
-//
-// new Thread(() -> {
-// try {
-// int count = box.getIndex();
-// while (count > 0) {
-// ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT(member.getAddress());
-// Thread.sleep(5000);
-// count--;
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// log.error("发放卡牌错误", e);
-// }
-// }).start();
-
Date time = new Date();
- Date expire = DateUtil.offset(time, DateField.HOUR, 2);
+ Date expire = DateUtil.offset(time, DateField.HOUR, 48);
DappNftActivation nftActivation = new DappNftActivation();
nftActivation.setMemberId(member.getId());
nftActivation.setCount(box.getIndex());
@@ -428,20 +424,28 @@
DappNftActivation nftActive = dappNftActivationDao.selectById(activeDto.getId());
if (nftActive == null) {
- throw new FebsException("NFT不存在");
+ throw new FebsException(MessageSourceUtils.getString("nft_active_003"));
}
if (nftActive.getCount() < activeDto.getCount()) {
- throw new FebsException("NFT不足或者正在激活中");
+ throw new FebsException(MessageSourceUtils.getString("nft_active_004"));
+ }
+
+ if (DateUtil.between(new Date(), nftActive.getExpireTime(), DateUnit.SECOND) < 0) {
+ throw new FebsException(MessageSourceUtils.getString("nft_active_005"));
}
if (nftActive.getStatus() != 1) {
throw new FebsException(MessageSourceUtils.getString("nft_active_001"));
}
-
+ PriceDto priceDto = new PriceDto();
+ priceDto.setAmount(BigDecimal.ZERO);
+ Map<String, BigDecimal> price = calPrice(priceDto);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(activeDto.getCount()), 8, 1, BigDecimal.ZERO, activeDto.getTxHash());
- fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())));
+
+ fundFlow.setTargetAmount(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())).multiply(price.get("x")));
+ fundFlow.setNewestPrice(price.get("x"));
dappFundFlowDao.insert(fundFlow);
int count = nftActive.getCount() - activeDto.getCount();
@@ -480,4 +484,241 @@
return list;
}
+
+ @Override
+ public FebsResponse findMemberWalletCoin() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Long memberId = member.getId();
+
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
+ ApiMemberWalletCoinVo apiMemberWalletCoinVo = new ApiMemberWalletCoinVo();
+ if(ObjectUtil.isNotEmpty(dappWalletCoinEntity)){
+ apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(2,BigDecimal.ROUND_DOWN));
+ apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(2,BigDecimal.ROUND_DOWN));
+ apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN));
+ }
+ return new FebsResponse().success().data(apiMemberWalletCoinVo);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse transferInside(ApiTransferInsideDto apiTransferInsideDto) {
+ //判断入参
+ BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
+ if(BigDecimal.ZERO.compareTo(balance) >= 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferInsideDto.getTransferCode())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+
+ DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
+ Long memberIdOut = dappMemberEntityOut.getId();
+ //判断双方是否是会员
+ if(ObjectUtil.isEmpty(dappMemberEntityOut.getInviteId())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_002"));
+ }
+ String inviteIdOut = dappMemberEntityOut.getInviteId();
+ Boolean isMemberOut = dappMemberService.isMember(inviteIdOut);
+ if(!isMemberOut){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_002"));
+ }
+ String username = apiTransferInsideDto.getUsername();
+ DappMemberEntity memberEntityIn = dappMemberDao.selectMemberInfoByUsername(username);
+ if (ObjectUtil.isEmpty(memberEntityIn)) {
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
+ }
+
+ String inviteIdIn = memberEntityIn.getInviteId();
+ Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
+ if(!isMemberIn){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
+ }
+ //验证资金密码
+ Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferInsideDto.getTransferCode(), dappMemberEntityOut.getId());
+ if(!aBoolean){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+ //判断内部转账规则
+ DataDictionaryCustom withdrawTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_TIMES.getType(), DataDictionaryEnum.WITHDRAW_TIMES.getCode());
+//
+// DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+// //todo 获取用户的总收益
+// BigDecimal totalProfitOut = new BigDecimal("0.3");
+// BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
+// if(outAccountProfit.compareTo(totalProfitOut) > 0){
+// return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+// }
+ DataDictionaryCustom accountRelationDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ACCOUNT_RELATION.getType(), DataDictionaryEnum.ACCOUNT_RELATION.getCode());
+ Integer accountRelation = Integer.parseInt(accountRelationDic.getValue());
+ if(1 == accountRelation){
+ Boolean relationShip = dappMemberService.isRelationShip(inviteIdOut, inviteIdIn);
+ if(!relationShip){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_005"));
+ }
+ }
+// DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SERVICE_FEE.getType(), DataDictionaryEnum.SERVICE_FEE.getCode());
+// Integer serviceFee = Integer.parseInt(serviceFeeDic.getValue());
+ //查询转出会员
+ //转出会员当前余额要大于等于划转金额
+ DappWalletCoinEntity dappWalletCoinEntityOut = dappWalletCoinDao.selectByMemberId(memberIdOut);
+ BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(2,BigDecimal.ROUND_DOWN);
+ if(availableAmountOut.compareTo(balance) < 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
+ }
+ //转出账户,余额减少,冻结增加
+ Integer countOut = dappWalletCoinDao.addFrozenAndDelAvailableById(dappWalletCoinEntityOut.getId(), balance);
+ if(1 != countOut){
+ throw new FebsException(MessageSourceUtils.getString("balance_err_002"));
+ }
+ //转出账户生成一条内部转账记录
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
+ memberCoinWithdrawEntity.setAddress(inviteIdIn);
+ memberCoinWithdrawEntity.setAmount(balance);
+ memberCoinWithdrawEntity.setFeeAmount(BigDecimal.ZERO);
+ memberCoinWithdrawEntity.setSymbol("USDT");
+ memberCoinWithdrawEntity.setMemberId(memberIdOut);
+ memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+ memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
+ memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse transferPasswordSet(ApiTransferPasswordDto apiTransferPasswordDto) {
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getOldTransferPassword())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_007"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword())
+ || ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
+ }
+ String newTransferPassword = apiTransferPasswordDto.getNewTransferPassword();
+ String newTransferPasswordAgain = apiTransferPasswordDto.getNewTransferPasswordAgain();
+ if(!newTransferPassword.equals(newTransferPasswordAgain)){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
+ }
+
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+ DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+ memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ dappMemberDao.updateById(memberEntity);
+
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse transferOutside(ApiTransferOutsideDto apiTransferOutsideDto) {
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+
+ if(ObjectUtil.isEmpty(apiTransferOutsideDto.getAddress())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0010"));
+ }
+ String address = apiTransferOutsideDto.getAddress();
+
+ if(ObjectUtil.isEmpty(apiTransferOutsideDto.getBalance())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
+ }
+
+ BigDecimal balance = apiTransferOutsideDto.getBalance();
+ if(BigDecimal.ZERO.compareTo(balance) >= 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
+ }
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
+ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
+ if(balance.compareTo(availableAmount) > 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
+ }
+
+ //验证资金密码
+ Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferOutsideDto.getTransferCode(), memberId);
+ if(!aBoolean){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+ //提现条件收益率
+ DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ //todo 获取用户的总收益
+ BigDecimal totalProfitOut = new BigDecimal("0.3");
+ BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
+ if(outAccountProfit.compareTo(totalProfitOut) > 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+ }
+ //余额减少冻结增加
+ Integer count = dappWalletCoinDao.addFrozenAndDelAvailableById(memberId, balance);
+ if(1 != count){
+ throw new FebsException(MessageSourceUtils.getString("balance_err_002"));
+ }
+ DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SERVICE_FEE.getType(), DataDictionaryEnum.SERVICE_FEE.getCode());
+ BigDecimal serviceFee = new BigDecimal(serviceFeeDic.getValue());
+
+ //转出账户生成一条内部转账记录
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
+ memberCoinWithdrawEntity.setAddress(address);
+ memberCoinWithdrawEntity.setTag(apiTransferOutsideDto.getType());
+ memberCoinWithdrawEntity.setAmount(balance);
+ memberCoinWithdrawEntity.setFeeAmount(serviceFee);
+ memberCoinWithdrawEntity.setSymbol("USDT");
+ memberCoinWithdrawEntity.setMemberId(memberId);
+ memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+ memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
+ memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
+ @Override
+ public FebsResponse transferPassword(ApiTransferPasswordDto apiTransferPasswordDto) {
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword())
+ || ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
+ }
+ String newTransferPassword = apiTransferPasswordDto.getNewTransferPassword();
+ String newTransferPasswordAgain = apiTransferPasswordDto.getNewTransferPasswordAgain();
+ if(!newTransferPassword.equals(newTransferPasswordAgain)){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
+ }
+
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+ DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+ memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ dappMemberDao.updateById(memberEntity);
+
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
+ @Override
+ public FebsResponse updatePassword(ApiUpdatePasswordDto apiUpdatePasswordDto) {
+ if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getOldTransferPassword())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_007"));
+ }
+ if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPassword())
+ || ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPasswordAgain())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
+ }
+ String newTransferPassword = apiUpdatePasswordDto.getNewTransferPassword();
+ String newTransferPasswordAgain = apiUpdatePasswordDto.getNewTransferPasswordAgain();
+ if(!newTransferPassword.equals(newTransferPasswordAgain)){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
+ }
+
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+ DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+ memberEntity.setPassword(SecureUtil.md5(apiUpdatePasswordDto.getNewTransferPassword()));
+ dappMemberDao.updateById(memberEntity);
+
+ String redisKey = AppContants.REDIS_KEY_SIGN + memberId;
+ redisUtils.del(redisKey);
+
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
}
--
Gitblit v1.9.1