From 20fdd0a00cfc650d1850b844856509167f5ff687 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 11:07:20 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java | 6 ++++++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 17 ++++++++++++-----
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 2 --
3 files changed, 18 insertions(+), 7 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 ae3756a..0ae5d27 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
@@ -352,8 +352,6 @@
return memberService.memberMessageReminder();
}
- /**
-
/**
* 提币币种信息
* @return
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java
index 012821c..dec0ffe 100644
--- a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
+
@Data
@ApiModel(value = "MemberFingerprintStateDto", description = "参数接收类")
public class MemberFingerprintStateDto {
@@ -11,4 +13,8 @@
@ApiModelProperty(value = "是否开启0：否 1：是", example = "0")
private Integer fingerprintState;
+ @NotNull(message = "登录密码不能为空")
+ @ApiModelProperty(value = "登录密码", example = "123564")
+ private String password;
+
}
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 ab33eae..92948aa 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
@@ -1136,11 +1136,18 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- Integer fingerprintState = memberFingerprintStateDto.getFingerprintState();
- MemberEntity memberEntity = memberDao.selectById(memberId);
- memberEntity.setFingerprintState(fingerprintState);
- memberDao.updateById(memberEntity);
- return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ String password = SecureUtil.md5(memberFingerprintStateDto.getPassword());
+ MemberEntity member = memberDao.selectById(memberId);
+
+ if(password.equals(member.getPassword())){
+ Integer fingerprintState = memberFingerprintStateDto.getFingerprintState();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+ memberEntity.setFingerprintState(fingerprintState);
+ memberDao.updateById(memberEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }else{
+ return Result.fail(MessageSourceUtils.getString("home_service_0005"));
+ }
}
@Override
--
Gitblit v1.9.1