From 5c3ca24895ddaba9bf8587bc6d7d621c3fd0177f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 31 May 2020 16:44:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberSendCodeWayVo.java | 23 +++++++++++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 62 ++++++++++---------------------
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 12 ++++++
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 2 +
4 files changed, 57 insertions(+), 42 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 1ec2273..b181708 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
@@ -24,6 +24,7 @@
import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;
import com.xcong.excoin.modules.member.service.MemberService;
import io.swagger.annotations.Api;
@@ -225,6 +226,17 @@
public Result memberAddCoinAddress(@RequestBody @Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
return memberService.memberAddCoinAddress(memberAddCoinAddressDto);
}
+
+ /**
+ * 获取发送验证码途径
+ * @return
+ */
+ @ApiOperation(value = "获取发送验证码途径", notes = "获取发送验证码途径")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberSendCodeWayVo.class)})
+ @GetMapping(value = "/memberSendCodeWay")
+ public Result memberSendCodeWay() {
+ return memberService.memberSendCodeWay();
+ }
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberSendCodeWayVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberSendCodeWayVo.java
new file mode 100644
index 0000000..3f01954
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberSendCodeWayVo.java
@@ -0,0 +1,23 @@
+package com.xcong.excoin.modules.member.parameter.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberSendCodeWayVo", description = "发送验证码途径信息")
+public class MemberSendCodeWayVo {
+
+ /**
+ * 手机号(包含国际手机号)
+ */
+ @ApiModelProperty(value = "手机号(包含国际手机号)")
+ private String phone;
+
+ /**
+ * 邮箱
+ */
+ @ApiModelProperty(value = "邮箱")
+ 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 1d6bd22..7f58936 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
@@ -55,5 +55,7 @@
public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto);
+ public Result memberSendCodeWay();
+
}
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 57db5fb..1f3d59b 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
@@ -31,6 +31,7 @@
import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;
@@ -39,7 +40,6 @@
import com.xcong.excoin.utils.ShareCodeUtil;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -241,11 +241,6 @@
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + account);
- }else {
- redisUtils.del("EMAIL_" + account);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0048"));
}
@@ -267,11 +262,6 @@
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_0040"));
}
@@ -394,14 +384,9 @@
if (flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
- if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type)) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0051"));
}
- return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
@@ -413,15 +398,6 @@
MemberEntity memberEntity = memberDao.selectById(memberId);
if (ObjectUtil.isEmpty(memberEntity)) {
return Result.fail(MessageSourceUtils.getString("member_service_0003"));
- }
-
- String phone = memberEntity.getPhone();
- if(StrUtil.isEmpty(phone)) {
- redisUtils.del(memberEntity.getPhone());
- }
- String email = memberEntity.getEmail();
- if(StrUtil.isEmpty(email)) {
- redisUtils.del(memberEntity.getPhone());
}
return Result.ok(MessageSourceUtils.getString("member_service_0071"));
@@ -447,11 +423,6 @@
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + account);
- }else {
- redisUtils.del("EMAIL_" + account);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0068"));
}
@@ -563,7 +534,6 @@
}
member.setPhone(phone);
memberDao.updateById(member);
- redisUtils.del("SMS_" + member.getPhone());
return Result.ok(MessageSourceUtils.getString("member_service_0014"));
}
@@ -580,18 +550,13 @@
String code = memberBindEmailDto.getCode();
MemberEntity member = memberDao.selectById(memberId);
- String verifyCode = (String)redisUtils.get("EMAIL_" + email);
+ boolean flag = commonservice.verifyCode(email, code);
if (ObjectUtil.isNotEmpty(member)) {
- if (StringUtils.isBlank(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0012"));
+ if (flag) {
+ member.setEmail(email);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
- if (!code.equals(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0039"));
- }
- member.setEmail(email);
- memberDao.updateById(member);
- redisUtils.del("EMAIL_" + member.getPhone());
- return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
return Result.fail(MessageSourceUtils.getString("member_service_0019"));
}
@@ -664,4 +629,17 @@
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
+ @Override
+ public Result memberSendCodeWay() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+ MemberSendCodeWayVo memberSendCodeWayVo = new MemberSendCodeWayVo();
+ if(ObjectUtil.isNotEmpty(member)) {
+ memberSendCodeWayVo.setPhone(member.getPhone());
+ memberSendCodeWayVo.setEmail(member.getEmail());
+ }
+ return Result.ok(memberSendCodeWayVo);
+ }
+
}
--
Gitblit v1.9.1