From 094e778906d628e346363b18a702d0d0f9288fa5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 30 May 2020 15:27:19 +0800
Subject: [PATCH] 20200530 代码提交
---
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java | 8 +-
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java | 6 ++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 88 ++++++++++++++++++++--------
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java | 24 ++++++++
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java | 8 +-
5 files changed, 98 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java
index bec370c..4bf9314 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAddCoinAddressDto.java
@@ -1,10 +1,34 @@
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 = "MemberAddCoinAddressDto", description = "增加提币地址参数接收类")
public class MemberAddCoinAddressDto {
+
+ @NotNull(message = "币种ID不能为空")
+ @ApiModelProperty(value = "币种ID")
+ private Long symbolscoinId;
+ /**
+ * 地址
+ */
+ @NotNull(message = "地址不能为空")
+ @ApiModelProperty(value = "地址")
+ private String address;
+ /**
+ * 是否是本平台地址1：是 0：否
+ */
+ @NotNull(message = "是否是本平台地址不能为空")
+ @ApiModelProperty(value = "是否是本平台地址1：是 0：否")
+ private String isBiyict;
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注")
+ private String remark;
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java
index 8da3cde..9ff9a5d 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java
@@ -22,10 +22,8 @@
@ApiModelProperty(value = "验证类型 1 手机号码 2 邮箱", example = "1")
private int type;
- @ApiModelProperty(value = "电话号码", example = "13412341234")
- private String phone;
+ @NotNull(message = "验证账号不能为空")
+ @ApiModelProperty(value = "验证账号", example = "13412341234")
+ private String account;
- @ApiModelProperty(value = "邮箱", example = "www.13412341234@123.com")
- private String email;
-
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java
index b40e1a2..650b4d7 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java
@@ -22,10 +22,8 @@
@ApiModelProperty(value = "验证类型 1 手机号码 2 邮箱", example = "1")
private int type;
- @ApiModelProperty(value = "电话号码", example = "13412341234")
- private String phone;
+ @NotNull(message = "验证账号不能为空")
+ @ApiModelProperty(value = "验证账号", example = "13412341234")
+ private String account;
- @ApiModelProperty(value = "邮箱", example = "www.13412341234@123.com")
- private String email;
-
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java
index cd05e97..5532f0b 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinAddressVo.java
@@ -35,5 +35,11 @@
*/
@ApiModelProperty(value = "是否是本平台地址1：是 0：否")
private String isBiyict;
+
+ @ApiModelProperty(value = "备注")
+ private String label;
+
+ @ApiModelProperty(value = "ID")
+ private Long symbolscoinId;
}
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 9217b09..8477168 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
@@ -12,6 +12,7 @@
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.dto.RegisterDto;
+import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
@@ -87,6 +88,9 @@
@Resource
MemberCoinAddressDao memberCoinAddressDao;
+
+ @Resource
+ private CommonService commonservice;
@Transactional()
@Override
@@ -200,23 +204,23 @@
public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
int type = memberForgetPwdDto.getType();
- String phone = memberForgetPwdDto.getPhone();
- String email = memberForgetPwdDto.getEmail();
+ String account = memberForgetPwdDto.getAccount();
String code = memberForgetPwdDto.getCode();
String password = memberForgetPwdDto.getPassword();
Map<String, Object> hashMap = new HashMap<>();
if(type == 1) {
- hashMap.put("phone", phone);
+ hashMap.put("phone", account);
}else {
- hashMap.put("email", email);
+ hashMap.put("email", account);
}
List<MemberEntity> member = memberDao.selectByMap(hashMap);
if (CollUtil.isEmpty(member)) {
return Result.fail(MessageSourceUtils.getString("member_service_0047"));
}
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
+
+ boolean flag = commonservice.verifyCode(account, code);
+ if(flag) {
MemberEntity memberEntity = member.get(0);
memberEntity.setPassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
@@ -224,9 +228,9 @@
return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
if(type == 1) {
- redisUtils.del("SMS_" + phone);
+ redisUtils.del("SMS_" + account);
}else {
- redisUtils.del("EMAIL_" + email);
+ redisUtils.del("EMAIL_" + account);
}
return Result.ok(MessageSourceUtils.getString("member_service_0048"));
}
@@ -359,22 +363,32 @@
String code = memberUpdateTradePwdDto.getCode();
String password = memberUpdateTradePwdDto.getPassword();
+ String account = memberUpdateTradePwdDto.getAccount();
String phone = memberEntity.getPhone();
String email = memberEntity.getEmail();
int type = memberUpdateTradePwdDto.getType();
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
- memberEntity.setTradePassword(SecureUtil.md5(password));
- memberDao.updateById(memberEntity);
- }else {
+
+ //验证手机号或者邮箱是否是该账户绑定的手机号或者邮箱
+ if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type) && !phone.equals(account)) {
return Result.fail(MessageSourceUtils.getString("member_service_0041"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
+ if(MemberEntity.ACCOUNT_TYPE_EMAIL.equals(type) && !email.equals(account)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0041"));
}
- return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+
+ boolean flag = commonservice.verifyCode(account, code);
+ 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"));
+
}
@Override
@@ -408,20 +422,21 @@
String code = memberForgetPwdDto.getCode();
String password = memberForgetPwdDto.getPassword();
- String phone = memberForgetPwdDto.getPhone();
- String email = memberForgetPwdDto.getEmail();
+ String account = memberForgetPwdDto.getAccount();
int type = memberForgetPwdDto.getType();
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
+
+ boolean flag = commonservice.verifyCode(account, code);
+ if(flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
}
+
if(type == 1) {
- redisUtils.del("SMS_" + phone);
+ redisUtils.del("SMS_" + account);
}else {
- redisUtils.del("EMAIL_" + email);
+ redisUtils.del("EMAIL_" + account);
}
return Result.ok(MessageSourceUtils.getString("member_service_0068"));
}
@@ -515,6 +530,7 @@
}
@Override
+ @Transactional
public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
@@ -541,6 +557,7 @@
}
@Override
+ @Transactional
public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
//获取用户ID
@@ -597,6 +614,8 @@
memberCoinAddressVo.setMemberId(memberCoinAddressEntity.getMemberId());
memberCoinAddressVo.setPrivateKey(memberCoinAddressEntity.getPrivateKey());
memberCoinAddressVo.setSymbol(memberCoinAddressEntity.getSymbol());
+ memberCoinAddressVo.setLabel(memberCoinAddressEntity.getLabel());
+ memberCoinAddressVo.setSymbolscoinId(memberCoinAddressEntity.getSymbolscoinId());
arrayList.add(memberCoinAddressVo);
}
}
@@ -606,9 +625,26 @@
}
@Override
+ @Transactional
public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
- // TODO Auto-generated method stub
- return null;
+
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ String address = memberAddCoinAddressDto.getAddress();
+ String isBiyict = memberAddCoinAddressDto.getIsBiyict();
+ Long symbolscoinId = memberAddCoinAddressDto. getSymbolscoinId();
+ String remark = memberAddCoinAddressDto.getRemark();
+
+ MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
+ memberCoinAddressEntity.setAddress(address);
+ memberCoinAddressEntity.setMemberId(memberId);
+ memberCoinAddressEntity.setIsBiyict(isBiyict);
+ memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
+ memberCoinAddressEntity.setLabel(remark);
+
+ memberCoinAddressDao.insert(memberCoinAddressEntity);
+
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
}
--
Gitblit v1.9.1