From 042fca9de7bf017119bb291157db75df2fac21bd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 30 Nov 2020 11:02:11 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin into outcenter

---
 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java |   16 ++++++++++++++++
 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java    |   13 +++++++++++++
 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java          |    2 ++
 3 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 3d60c30..9534665 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -118,6 +118,19 @@
 	}
 	
 	/**
+	 *  验证资金密码是否正确
+	 * @return
+	 */
+	@ApiOperation(value="getMemberTradeCode", notes="验证资金密码是否正确")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "tradeCode", value = "资金密码", required = true, dataType = "String", paramType="query"),
+	})
+	@GetMapping(value = "/getMemberTradeCode")
+	public Result  getMemberTradeCode(String tradeCode) {
+		return memberService.getMemberTradeCode(tradeCode);
+	}
+	
+	/**
 	 *  获取对应的助记词
 	 * @return
 	 */
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index ce62f14..2a5d3ab 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -99,6 +99,8 @@
 
 	public Result getMnemonicWordList();
 
+	public Result getMemberTradeCode(String tradeCode);
+
 
 
 }
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 f6551eb..31a924b 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
@@ -1420,6 +1420,22 @@
         }
         return Result.ok(list);
 	}
+
+	@Override
+	public Result getMemberTradeCode(String tradeCode) {
+		//获取用户ID
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        MemberEntity memberEntity = memberDao.selectById(memberId);
+        String tradePassword = memberEntity.getTradePassword();
+        if(StrUtil.isEmpty(tradePassword)) {
+        	return Result.fail(MessageSourceUtils.getString("member_controller_0002"));
+        }
+        if(!SecureUtil.md5(tradeCode).equals(tradePassword)) {
+        	return Result.fail(MessageSourceUtils.getString("member_controller_0004"));
+        }
+        
+        return Result.ok("");
+	}
 }
 
 

--
Gitblit v1.9.1