From 9a23df1d457f474905141930a4403b9bcd22d75f Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 03 Mar 2021 16:20:49 +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/service/impl/MemberServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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 84b6eac..6b24216 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
@@ -677,10 +677,10 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
String address = memberAddCoinAddressDto.getAddress();
String isBiyict = memberAddCoinAddressDto.getIsBiyict();
- Long symbolscoinId = memberAddCoinAddressDto.getSymbolscoinId();
+ String symbol = memberAddCoinAddressDto.getSymbol();
String remark = memberAddCoinAddressDto.getRemark();
-
- PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectById(symbolscoinId);
+ PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectOneBySymbol(symbol);
+ Long symbolscoinId = platformSymbolsCoinEntity.getId();
MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
memberCoinAddressEntity.setAddress(address);
@@ -1136,7 +1136,7 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- String password = memberFingerprintStateDto.getPassword();
+ String password = SecureUtil.md5(memberFingerprintStateDto.getPassword());
MemberEntity member = memberDao.selectById(memberId);
if(password.equals(member.getPassword())){
@@ -1151,12 +1151,17 @@
}
@Override
+ @Transactional
public Result memberMessageReminder() {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
- MemberSettingEntity selectById = memberSettingDao.selectById(memberId);
MemberMessageReminderVo memberMessageReminderVo = new MemberMessageReminderVo();
- memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
+ MemberSettingEntity selectById = memberSettingDao.selectMemberSettingByMemberId(memberId);
+ if(ObjectUtil.isNotEmpty(selectById)) {
+ memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
+ }
+ selectById.setMessageReminder(0);
+ memberSettingDao.updateById(selectById);
return Result.ok(memberMessageReminderVo);
}
--
Gitblit v1.9.1