From f6f20935faf69964bced9f9a0a5214888c7f1ec7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 23 Nov 2020 14:50:18 +0800
Subject: [PATCH] 20201123
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 05c23ce..39564d2 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -15,19 +15,20 @@
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.common.system.dao.WalletDetailDao;
-import com.xcong.excoin.common.system.dao.WtTokenDao;
-import com.xcong.excoin.common.system.dao.WtWalletDao;
-import com.xcong.excoin.common.system.dao.WtWordDao;
import com.xcong.excoin.common.system.dto.OutCenterRegisterDto;
import com.xcong.excoin.common.system.dto.RegisterDto;
-import com.xcong.excoin.common.system.entity.WtToken;
-import com.xcong.excoin.common.system.entity.WtWallet;
-import com.xcong.excoin.common.system.entity.WtWalletDetail;
+import com.xcong.excoin.common.system.dto.WtWalletDto;
import com.xcong.excoin.common.system.service.CommonService;
-import com.xcong.excoin.common.system.vo.LoginVo;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
+import com.xcong.excoin.modules.login.dao.WalletDetailDao;
+import com.xcong.excoin.modules.login.dao.WtTokenDao;
+import com.xcong.excoin.modules.login.dao.WtWalletDao;
+import com.xcong.excoin.modules.login.dao.WtWordDao;
+import com.xcong.excoin.modules.login.entity.WtToken;
+import com.xcong.excoin.modules.login.entity.WtWallet;
+import com.xcong.excoin.modules.login.entity.WtWalletDetail;
+import com.xcong.excoin.modules.login.vo.LoginVo;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -1266,14 +1267,14 @@
@Transactional
@Override
- public Result recovery(WtWallet wallet) {
+ public Result recovery(WtWalletDto wtWalletDto) {
LoginVo loginVo = new LoginVo();
/**
* 判断钱包是否存在
*/
- List<String> mnemonicWordList = wallet.getMnemonicWordList();
+ List<String> mnemonicWordList = wtWalletDto.getMnemonicWordList();
if(CollectionUtils.isEmpty(mnemonicWordList)){
return Result.fail(MessageSourceUtils.getString("login_recovery_001"));
}
@@ -1300,8 +1301,8 @@
*/
MemberEntity member = new MemberEntity();
member.setAddress(address);
- member.setPassword(MD5Util.strToMD5(wallet.getPassword()));
- member.setTradePassword(MD5Util.strToMD5(wallet.getPassword()));
+ member.setPassword(MD5Util.strToMD5(wtWalletDto.getPassword()));
+ member.setTradePassword(MD5Util.strToMD5(wtWalletDto.getPassword()));
member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
--
Gitblit v1.9.1