From 5ecccfcdc599a3a71677b6d4393d4ff167064b1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 15:51:09 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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 c925f37..0bf02e4 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
@@ -509,12 +509,26 @@
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.getInviteId())){
+// return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+// }
+ if(ObjectUtil.isEmpty(apiTransferInsideDto.getUsername())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0011"));
}
if(ObjectUtil.isEmpty(apiTransferInsideDto.getTransferCode())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
+ //每日挂机时间段内禁止内转
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.START_TIME.getType(), DataDictionaryEnum.START_TIME.getCode());
+ DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
+ //获取时间对应的秒数
+ Integer dateNow = DateUtil.timeToSecond(DateUtil.formatTime(DateUtil.date()));
+ Integer startTime = DateUtil.timeToSecond(startTimeDic.getValue());
+ Integer endTime = DateUtil.timeToSecond(endTimeDic.getValue());
+ if(startTime <= dateNow && endTime >= dateNow){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0012"));
+ }
+
DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
Long memberIdOut = dappMemberEntityOut.getId();
@@ -527,8 +541,15 @@
if(!isMemberOut){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_002"));
}
- String inviteIdIn = apiTransferInsideDto.getInviteId();
- Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
+ 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(inviteIdIn);
+// Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
if(!isMemberIn){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
}
@@ -656,10 +677,15 @@
//转出账户生成一条内部转账记录
MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
memberCoinWithdrawEntity.setAddress(address);
- memberCoinWithdrawEntity.setTag(apiTransferOutsideDto.getType());
memberCoinWithdrawEntity.setAmount(balance);
memberCoinWithdrawEntity.setFeeAmount(serviceFee);
- memberCoinWithdrawEntity.setSymbol("USDT");
+ if(1 == apiTransferOutsideDto.getType()){
+ memberCoinWithdrawEntity.setTag("银行卡");
+ memberCoinWithdrawEntity.setSymbol("$");
+ }else{
+ memberCoinWithdrawEntity.setTag("钱包");
+ memberCoinWithdrawEntity.setSymbol("USDT");
+ }
memberCoinWithdrawEntity.setMemberId(memberId);
memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_NO);
@@ -688,4 +714,31 @@
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