From 233d60b729866fa1e8786bd6b0067022f6755ad4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 May 2020 19:30:48 +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 | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 2a159e7..9217b09 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
@@ -14,6 +14,7 @@
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
@@ -24,6 +25,8 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressVo;
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;
@@ -81,6 +84,9 @@
@Resource
PlatformSymbolsCoinDao platformSymbolsCoinDao;
+
+ @Resource
+ MemberCoinAddressDao memberCoinAddressDao;
@Transactional()
@Override
@@ -353,8 +359,8 @@
String code = memberUpdateTradePwdDto.getCode();
String password = memberUpdateTradePwdDto.getPassword();
- String phone = memberUpdateTradePwdDto.getPhone();
- String email = memberUpdateTradePwdDto.getEmail();
+ String phone = memberEntity.getPhone();
+ String email = memberEntity.getEmail();
int type = memberUpdateTradePwdDto.getType();
boolean verificationCode = verificationCode(type, phone, code, email);
if(verificationCode) {
@@ -572,4 +578,37 @@
return Result.fail(MessageSourceUtils.getString("member_service_0020"));
}
+ @Override
+ public Result memberCoinAddressList(String symbol) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ columnMap.put("symbol", symbol);
+ List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
+ MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
+ List<MemberCoinAddressVo> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(MemberCoinAddressEntity memberCoinAddressEntity : selectByMap) {
+ MemberCoinAddressVo memberCoinAddressVo = new MemberCoinAddressVo();
+ memberCoinAddressVo.setId(memberCoinAddressEntity.getId());
+ memberCoinAddressVo.setAddress(memberCoinAddressEntity.getAddress());
+ memberCoinAddressVo.setIsBiyict(memberCoinAddressEntity.getIsBiyict());
+ memberCoinAddressVo.setMemberId(memberCoinAddressEntity.getMemberId());
+ memberCoinAddressVo.setPrivateKey(memberCoinAddressEntity.getPrivateKey());
+ memberCoinAddressVo.setSymbol(memberCoinAddressEntity.getSymbol());
+ arrayList.add(memberCoinAddressVo);
+ }
+ }
+ memberCoinAddressListVo.setMemberCoinAddressVo(arrayList);
+
+ return Result.ok(memberCoinAddressListVo);
+ }
+
+ @Override
+ public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
--
Gitblit v1.9.1