From c5dc67c4453e6b0e616f38d7395e4736fa813931 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 31 May 2020 22:41:59 +0800
Subject: [PATCH] 20200531 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 124 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 118 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 1a07cf0..afcf057 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
@@ -19,28 +19,35 @@
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;
+import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto;
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;
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.MemberAuthenticationInfoVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
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.MemberCoinInfoListVo;
+import com.xcong.excoin.modules.member.parameter.vo.MemberCoinInfoVo;
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;
+import com.xcong.excoin.modules.member.parameter.vo.MemberPersonCenterInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;
import com.xcong.excoin.modules.member.service.MemberService;
+import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
+import com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity;
import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;
import com.xcong.excoin.utils.MessageSourceUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ShareCodeUtil;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -89,14 +96,17 @@
PlatformSymbolsCoinDao platformSymbolsCoinDao;
@Resource
+ PlatformFeeSettingDao platformFeeSettingDao;
+
+ @Resource
MemberCoinAddressDao memberCoinAddressDao;
@Resource
private CommonService commonservice;
-
+
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
-
+
@Transactional()
@Override
public Result register(RegisterDto registerDto) {
@@ -386,7 +396,7 @@
memberDao.updateById(memberEntity);
return Result.ok(MessageSourceUtils.getString("member_service_0051"));
}
- return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
@@ -442,7 +452,6 @@
String paymentQrcode = memberPaymethodDto.getPaymentQrcode();
String paymentType = memberPaymethodDto.getPaymentType();
String subBank = memberPaymethodDto.getSubBank();
- String isDefualt = memberPaymethodDto.getIsDefualt();
MemberPaymentMethodEntity memberPaymentMethodEntity = new MemberPaymentMethodEntity();
memberPaymentMethodEntity.setMemberId(memberId);
memberPaymentMethodEntity.setAccount(account);
@@ -451,7 +460,6 @@
memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
memberPaymentMethodEntity.setPaymentType(paymentType);
memberPaymentMethodEntity.setSubBank(subBank);
- memberPaymentMethodEntity.setIsDefualt(isDefualt);
memberPaymentMethodDao.insert(memberPaymentMethodEntity);
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -498,6 +506,7 @@
if(CollUtil.isNotEmpty(selectByMap)) {
for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
+ memberPaymethodDetailVo.setId(memberPaymentMethodEntity.getId());
memberPaymethodDetailVo.setAccount(memberPaymentMethodEntity.getAccount());
memberPaymethodDetailVo.setBank(memberPaymentMethodEntity.getBank());
memberPaymethodDetailVo.setMemberId(memberId);
@@ -642,4 +651,107 @@
return Result.ok(memberSendCodeWayVo);
}
+ @Override
+ @Transactional
+ public Result memberDelCoinAddress(@Valid MemberDelCoinAddressDto memberDelCoinAddressDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+ if(ObjectUtil.isNotEmpty(member)) {
+ Long id = memberDelCoinAddressDto.getId();
+ memberCoinAddressDao.deleteById(id);
+ }
+ return Result.ok("success");
+ }
+
+ @Override
+ public Result memberAuthenticationInfo() {
+ //获取用户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)) {
+ for(MemberAuthenticationEntity memberAuthenticationEntity : selectByMap) {
+ memberAuthnticationInfoVo.setFirstName(memberAuthenticationEntity.getFirstName());
+ memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
+ memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
+ memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
+ }
+ }
+ return Result.ok(memberAuthnticationInfoVo);
+ }
+
+ @Override
+ public Result memberPersonCenterInfo() {
+ //获取用户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);
+ }
+
+ @Override
+ 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<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
+ MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
+ memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
+ arrayList.add(memberCoinInfoVo);
+ }
+ }
+ memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
+
+ return Result.ok(memberCoinInfoListVo);
+ }
+
+ @Override
+ public Result memberAvivableCoinInfo(String symbol) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
+ 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);
+ }
+
}
--
Gitblit v1.9.1