From ad9c4daf2b270b75c07ecdc0c5f4ea67f60b2fb4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 May 2020 11:48:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 29 ++++++++++++++
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindPhoneDto.java | 21 ++++++++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 11 +++++
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 3 +
4 files changed, 63 insertions(+), 1 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 29453ea..4fb3ba8 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
@@ -11,6 +11,7 @@
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
@@ -164,6 +165,16 @@
return memberService.memberPaymethodDetailList();
}
+ /**
+ * 绑定手机号
+ * @return
+ */
+ @ApiOperation(value="绑定手机号", notes="绑定手机号")
+ @PostMapping(value="/memberBindPhone")
+ public Result memberBindPhone(@RequestBody @Valid MemberBindPhoneDto memberBindPhoneDto) {
+ return memberService.memberBindPhone(memberBindPhoneDto);
+ }
+
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindPhoneDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindPhoneDto.java
new file mode 100644
index 0000000..f7d6afc
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberBindPhoneDto.java
@@ -0,0 +1,21 @@
+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 = "MemberBindPhoneDto", description = "绑定手机号参数接收类")
+public class MemberBindPhoneDto {
+
+ @NotNull(message = "验证码不能为空")
+ @ApiModelProperty(value = "验证码", example = "123456")
+ private String code;
+
+ @NotNull(message = "电话号码不能为空")
+ @ApiModelProperty(value = "电话号码", example = "13412341234")
+ private String phone;
+
+}
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 244c586..9371ccb 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
@@ -7,6 +7,7 @@
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
@@ -42,5 +43,7 @@
public Result memberPaymethodDetailList();
+ public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto);
+
}
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 a3a428e..587c354 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,6 +15,7 @@
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
@@ -318,7 +319,7 @@
memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
memberAuthenticationDao.insert(memberAuthenticationEntity);
- member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
+ member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_Y);
member.setIdcardNo(idCardNo);
memberDao.updateById(member);
/**
@@ -499,4 +500,30 @@
return Result.ok(memberPaymethodDetailListVo);
}
+ @Override
+ public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ String phone = memberBindPhoneDto.getPhone();
+ String code = memberBindPhoneDto.getCode();
+
+ MemberEntity member = memberDao.selectById(memberId);
+ String smsCode = redisUtils.get("SMS_" + phone) + "";
+
+ if (ObjectUtil.isNotEmpty(member)) {
+ if (StrUtil.isEmpty(smsCode)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0038"));
+ }
+ if (!smsCode.equals(code)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0013"));
+ }
+ member.setPhone(phone);
+ memberDao.updateById(member);
+ redisUtils.del("SMS_" + member.getPhone());
+ return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+ }
+
+ return Result.fail(MessageSourceUtils.getString("member_service_0015"));
+ }
+
}
--
Gitblit v1.9.1