From 7d4d43849aa80a6f36736a0deccc7e8d4fcd566f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 28 May 2020 11:37:03 +0800
Subject: [PATCH] 20200528 代码提交
---
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberTradersPwdDto.java | 31 +++++++++++++++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 27 +++++++++++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 26 +++++++-----
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java | 6 +++
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 3 +
5 files changed, 82 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
index f1e9dfb..aaa695a 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
@@ -22,6 +22,12 @@
*/
@ApiModelProperty(value = "币种")
private String symbol;
+
+ /**
+ * 订单类型 1、买入2、卖出
+ */
+ @ApiModelProperty(value = "订单类型")
+ private Integer orderType;
/**
* 市场价
*/
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 fc2ee84..509615d 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
@@ -51,9 +51,6 @@
/**
* 忘记密码
- * @param code 验证码
- * @param password 新密码
- * @param token 用户登录的token
* @return
*/
@ApiOperation(value=" 忘记密码", notes=" 忘记密码")
@@ -75,9 +72,6 @@
/**
* 实名认证
- * @param token
- * @param memberAuthenVo
- * @param request
* @return
*/
@ApiOperation(value="实名认证", notes="实名认证")
@@ -88,10 +82,6 @@
/**
* 修改资金密码
- *
- * @param code 验证码
- * @param password 新密码
- * @param token 用户登录的token
* @return
*/
@ApiOperation(value="修改资金密码", notes="修改资金密码")
@@ -102,7 +92,6 @@
/**
* 用户退出登录
- * @param token
* @return
*/
@ApiOperation(value="用户退出登录", notes="用户退出登录")
@@ -111,6 +100,21 @@
return memberService.memberLogout();
}
+ /**
+ * 设置交易密码
+ * @param code
+ * @param password
+ * @param token
+ * @return
+ */
+ @ApiOperation(value="设置交易密码", notes="设置交易密码")
+ @PostMapping(value="/memberUpdateTradePwd")
+ @RequestMapping(value="/memberTradersPwd")
+ public Result memberTradersPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
+ return memberService.memberTradersPwd(memberForgetPwdDto);
+ }
+
+
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberTradersPwdDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberTradersPwdDto.java
new file mode 100644
index 0000000..884119f
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberTradersPwdDto.java
@@ -0,0 +1,31 @@
+package com.xcong.excoin.modules.member.parameter.dto;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberTradersPwdDto", description = "设置交易密码参数接收类")
+public class MemberTradersPwdDto {
+
+ @NotNull(message = "验证码不能为空")
+ @ApiModelProperty(value = "验证码", example = "123456")
+ private String code;
+
+ @NotNull(message = "新密码不能为空")
+ @ApiModelProperty(value = "新密码", example = "qq123456")
+ private String password;
+
+ @NotNull(message = "验证类型不能为空")
+ @ApiModelProperty(value = "验证类型 1 手机号码 2 邮箱", example = "1")
+ private int type;
+
+ @ApiModelProperty(value = "电话号码", example = "13412341234")
+ private String phone;
+
+ @ApiModelProperty(value = "邮箱", example = "www.13412341234@123.com")
+ private String email;
+
+}
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 f222c10..641e35f 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
@@ -30,4 +30,7 @@
public Result memberLogout();
+ public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto);
+
+
}
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 2753794..89ee26b 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
@@ -374,4 +374,31 @@
return Result.ok(MessageSourceUtils.getString("member_service_0071"));
}
+ @Override
+ public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+
+ String code = memberForgetPwdDto.getCode();
+ String password = memberForgetPwdDto.getPassword();
+ String phone = memberForgetPwdDto.getPhone();
+ String email = memberForgetPwdDto.getEmail();
+ int type = memberForgetPwdDto.getType();
+ boolean verificationCode = verificationCode(type, phone, code, email);
+ if(verificationCode) {
+ memberEntity.setTradePassword(SecureUtil.md5(password));
+ memberDao.updateById(memberEntity);
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+ }
+ if(type == 1) {
+ redisUtils.del("SMS_" + phone);
+ }else {
+ redisUtils.del("EMAIL_" + email);
+ }
+ return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+ }
+
+
}
--
Gitblit v1.9.1