From 2a354a0de703a9afdfcab88913dedc260b1da76a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 24 Oct 2022 10:43:55 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 203 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 167 insertions(+), 36 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 774d39c..439afd5 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
@@ -36,6 +36,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,9 @@
private final DappNftActivationDao dappNftActivationDao;
private final DappMemberService dappMemberService;
private final MemberCoinWithdrawDao memberCoinWithdrawDao;
+ private final IgtOnHookPlanOrderItemDao igtOnHookPlanOrderItemdao;
+
+ private final RedisTemplate<String, Object> redisTemplate;
@Override
public WalletInfoVo walletInfo() {
@@ -494,9 +499,9 @@
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));
+ apiMemberWalletCoinVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN));
+ apiMemberWalletCoinVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount().setScale(4,BigDecimal.ROUND_DOWN));
+ apiMemberWalletCoinVo.setAvailableAmount(dappWalletCoinEntity.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN));
}
return new FebsResponse().success().data(apiMemberWalletCoinVo);
}
@@ -505,16 +510,30 @@
@Transactional(rollbackFor = Exception.class)
public FebsResponse transferInside(ApiTransferInsideDto apiTransferInsideDto) {
//判断入参
- BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal balance = apiTransferInsideDto.getBalance() == null ? BigDecimal.ZERO : apiTransferInsideDto.getBalance().setScale(4,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.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();
@@ -534,7 +553,8 @@
}
String inviteIdIn = memberEntityIn.getInviteId();
- Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
+ Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
+// Boolean isMemberIn = dappMemberService.isMember(apiTransferInsideDto.getInviteId());
if(!isMemberIn){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
}
@@ -544,15 +564,8 @@
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){
@@ -561,14 +574,36 @@
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);
+ BigDecimal availableAmountOut = dappWalletCoinEntityOut.getAvailableAmount().setScale(4,BigDecimal.ROUND_DOWN);
if(availableAmountOut.compareTo(balance) < 0){
return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
+ }
+ /**
+ * 提取金额小于收益，则不受限制
+ * 否则，计算收益占本金的比例。符合条件允许提现
+ */
+ //获取用户的总收益
+ BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,1,2);
+ if(balance.compareTo(totalProfitOut) > 0){
+ BigDecimal totalAmount = dappWalletCoinEntityOut.getTotalAmount();
+ //用户总收益率
+ BigDecimal divide = totalProfitOut.divide(totalAmount);
+ //提现条件收益率
+ DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
+ if(divide.compareTo(outAccountProfit) < 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+ }
+ }
+ //提现次数
+ DataDictionaryCustom withdrawTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_TIMES.getType(), DataDictionaryEnum.WITHDRAW_TIMES.getCode());
+ Integer withdrawTimes = Integer.parseInt(withdrawTimesDic.getValue());
+ Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberIdOut,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
+ if(withdrawTimesReal >= withdrawTimes){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
}
//转出账户,余额减少,冻结增加
Integer countOut = dappWalletCoinDao.addFrozenAndDelAvailableById(dappWalletCoinEntityOut.getId(), balance);
@@ -643,14 +678,30 @@
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"));
+
+ /**
+ * 提取金额小于收益，则不受限制
+ * 否则，计算收益占本金的比例。符合条件允许提现
+ */
+ //获取用户的总收益
+ BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,1,2);
+ if(balance.compareTo(totalProfit) >= 0){
+ BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
+ //用户总收益率
+ BigDecimal divide = totalProfit.divide(totalAmount);
+ //提现条件收益率
+ DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
+ if(divide.compareTo(outAccountProfit) < 0){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+ }
}
+ //（2）每24小时只能提现一次
+ Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
+ if(1 > withdrawTimesReal){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
+ }
+
//余额减少冻结增加
Integer count = dappWalletCoinDao.addFrozenAndDelAvailableById(memberId, balance);
if(1 != count){
@@ -666,7 +717,7 @@
memberCoinWithdrawEntity.setFeeAmount(serviceFee);
if(1 == apiTransferOutsideDto.getType()){
memberCoinWithdrawEntity.setTag("银行卡");
- memberCoinWithdrawEntity.setSymbol("RMB");
+ memberCoinWithdrawEntity.setSymbol("$");
}else{
memberCoinWithdrawEntity.setTag("钱包");
memberCoinWithdrawEntity.setSymbol("USDT");
@@ -680,6 +731,20 @@
@Override
public FebsResponse transferPassword(ApiTransferPasswordDto apiTransferPasswordDto) {
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getRealname())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getPhone())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getEmail())
+ && ObjectUtil.isEmpty(apiTransferPasswordDto.getWahtsApp())
+ && ObjectUtil.isEmpty(apiTransferPasswordDto.getTelegram())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword())
|| ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -689,11 +754,19 @@
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);
+
+ String realname = apiTransferPasswordDto.getRealname();
+ String phone = apiTransferPasswordDto.getPhone();
+ String email = apiTransferPasswordDto.getEmail();
+ String wahtsApp = apiTransferPasswordDto.getWahtsApp();
+ String telegram = apiTransferPasswordDto.getTelegram();
memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ memberEntity.setRealname(realname);
+ memberEntity.setPhone(phone);
+ memberEntity.setEmail(email);
+ memberEntity.setWahtsApp(wahtsApp);
+ memberEntity.setTelegram(telegram);
dappMemberDao.updateById(memberEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -701,9 +774,41 @@
@Override
public FebsResponse updatePassword(ApiUpdatePasswordDto apiUpdatePasswordDto) {
- if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getOldTransferPassword())){
- return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_007"));
+ //验证验证码是否正确
+ // 根据前端传回的token在redis中找对应的value
+ ValueOperations<String, Object> valueOperations = redisTemplate.opsForValue();
+ if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeToken()) || ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeValue())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_001"));
}
+ String codeToken = apiUpdatePasswordDto.getCodeToken();
+ String codeValue = apiUpdatePasswordDto.getCodeValue();
+ if (redisTemplate.hasKey(codeToken)) {
+ //验证通过, 删除对应的key
+ if (valueOperations.get(codeToken).equals(codeValue)) {
+ redisTemplate.delete(codeToken);
+ } else {
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_002"));
+ }
+ } else {
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_003"));
+ }
+ String username = apiUpdatePasswordDto.getUsername();
+ DappMemberEntity memberEntity = dappMemberDao.selectMemberInfoByUsername(username);
+ if (ObjectUtil.isEmpty(memberEntity)) {
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
+ }
+
+ String inviteIdIn = memberEntity.getInviteId();
+ Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
+ if(!isMemberIn){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
+ }
+ //验证资金密码
+ Boolean aBoolean = dappMemberService.validateTransferCode(apiUpdatePasswordDto.getTransferCode(), memberEntity.getId());
+ if(!aBoolean){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+
if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPassword())
|| ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -714,13 +819,39 @@
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;
+ String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+ redisUtils.del(redisKey);
+
+ return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
+ }
+
+ @Override
+ public FebsResponse rebitTest() {
+ return null;
+ }
+
+ @Override
+ public FebsResponse resetPassword(ApiResetPasswordDto apiResetPasswordDto) {
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+
+ if(ObjectUtil.isEmpty(apiResetPasswordDto.getNewPassword())
+ || ObjectUtil.isEmpty(apiResetPasswordDto.getNewPasswordAgain())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
+ }
+ String newPassword = apiResetPasswordDto.getNewPassword();
+ String newPasswordAgain = apiResetPasswordDto.getNewPasswordAgain();
+ if(!newPassword.equals(newPasswordAgain)){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
+ }
+ DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+ memberEntity.setPassword(SecureUtil.md5(apiResetPasswordDto.getNewPassword()));
+ dappMemberDao.updateById(memberEntity);
+
+ String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
redisUtils.del(redisKey);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
--
Gitblit v1.9.1