From 9031180e72e881827c30e757237a63ce9304c149 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 22:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 afcf057..aa2feaa 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
@@ -25,6 +25,7 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
+import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -97,16 +98,16 @@
@Resource
PlatformFeeSettingDao platformFeeSettingDao;
-
+
@Resource
MemberCoinAddressDao memberCoinAddressDao;
@Resource
private CommonService commonservice;
-
+
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
-
+
@Transactional()
@Override
public Result register(RegisterDto registerDto) {
@@ -150,7 +151,7 @@
String ids = "";
while (!flag) {
ids += ("," + parentId);
- MemberEntity parentMember = memberDao.selectMemberInfoByRefererId(parentId);
+ MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
if (parentMember == null) {
break;
}
@@ -669,11 +670,11 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
-
+
Map<String, Object> columnMap = new HashMap<>();
columnMap.put("member_id", memberId);
List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
-
+
MemberAuthenticationInfoVo memberAuthnticationInfoVo = new MemberAuthenticationInfoVo();
memberAuthnticationInfoVo.setCertifyStatus(member.getCertifyStatus());
if(CollUtil.isNotEmpty(selectByMap)) {
@@ -692,28 +693,28 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
-
+
MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
if(StrUtil.isNotEmpty(member.getPhone())) {
memberPersonCenterInfoVo.setPhone(1);
}
memberPersonCenterInfoVo.setPhone(0);
-
+
if(StrUtil.isNotEmpty(member.getEmail())) {
memberPersonCenterInfoVo.setEmail(1);
}
memberPersonCenterInfoVo.setEmail(0);
-
+
if(StrUtil.isNotEmpty(member.getTradePassword())) {
memberPersonCenterInfoVo.setTradePassword(1);
}
memberPersonCenterInfoVo.setTradePassword(0);
-
+
if(StrUtil.isNotEmpty(member.getTradeAgingSetting().toString())) {
memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
}
memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
-
+
return Result.ok(memberPersonCenterInfoVo);
}
@@ -721,7 +722,7 @@
public Result memberCoinInfoList() {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
-
+
MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
List<MemberCoinInfoVo> arrayList = new ArrayList<>();
@@ -733,7 +734,7 @@
}
}
memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
-
+
return Result.ok(memberCoinInfoListVo);
}
@@ -745,13 +746,29 @@
if (ObjectUtil.isEmpty(walletCoin)) {
return Result.fail(MessageSourceUtils.getString("member_service_0087"));
}
-
+
MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
-
+
PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2,symbol);
memberAvivableCoinInfoVo.setFee(feeSetting.getFeePrice());
return Result.ok(memberAvivableCoinInfoVo);
}
+ @Override
+ public NeedMoneyMemberVo selectFriendRelationUserByMemberId(Long memberId){
+ return memberDao.selectFriendRelationUserByMemberId(memberId);
+ }
+
+ @Override
+ public List<NeedMoneyMemberVo> selectAllNeedMoneyMember(List<String> list) {
+ return memberDao.selectAllNeedMoneyMember(list);
+ }
+
+ @Override
+ public MemberEntity selectMemberInfoByInviteId(String inviteId) {
+ return memberDao.selectMemberInfoByInviteId(inviteId);
+ }
+
+
}
--
Gitblit v1.9.1