From 74e6993aee71c84dce965bdd6428b0cff5bda57f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 17:58:30 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 d0dcea4..0d97b5a 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
@@ -711,6 +711,15 @@
DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
Long memberId = dappMemberEntity.getId();
DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+ //验证旧密码是否正确
+ String transferCode = memberEntity.getTransferCode();
+ String oldTransferPassword = apiTransferPasswordDto.getOldTransferPassword();
+ oldTransferPassword = rsa.decryptStr(oldTransferPassword, KeyType.PrivateKey);
+ oldTransferPassword = SecureUtil.md5(oldTransferPassword);
+ if(!oldTransferPassword.equals(transferCode)){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0018"));
+ }
+
memberEntity.setTransferCode(SecureUtil.md5(newTransferPassword));
dappMemberDao.updateById(memberEntity);
@@ -926,7 +935,17 @@
memberEntity.setPassword(SecureUtil.md5(newTransferPassword));
dappMemberDao.updateById(memberEntity);
+// String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+// redisUtils.del(redisKey);
+
String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
redisUtils.del(redisKey);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -960,13 +979,23 @@
memberEntity.setPassword(SecureUtil.md5(newPassword));
dappMemberDao.updateById(memberEntity);
+// String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+// redisUtils.del(redisKey);
+
String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
redisUtils.del(redisKey);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
@Override
- public BigDecimal updateLSYJYLFC(List<String> refererIdList,BigDecimal totalProfit,long id) {
+ public BigDecimal updateLSYJ(List<String> refererIdList,BigDecimal totalProfit,long id) {
//计算盈利分成
BigDecimal profitSharingTotal = BigDecimal.ZERO;
if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
@@ -1178,10 +1207,17 @@
profitSharingTotal = profitSharingTotal.add(multiply);
}
}
-
-
}
+ return profitSharingTotal;
+ }
+
+ @Override
+ public BigDecimal updateYLFC(List<String> refererIdList, BigDecimal totalProfit, long id) {
//计算流水佣金
+ BigDecimal profitSharingTotal = BigDecimal.ZERO;
+ if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
+ return profitSharingTotal;
+ }
if(CollUtil.isNotEmpty(refererIdList)){
String LEVEL_AIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_AIB.getCode());
if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
--
Gitblit v1.9.1