From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +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 | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 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 07dea96..c6b3e0f 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
@@ -18,20 +18,7 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
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.MemberAddCoinAddressInDto;
-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.MemberSubmitCoinApplyDto;
-import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyInDto;
-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.dto.MemberUpdateTradersPwdTimeDto;
+import com.xcong.excoin.modules.member.parameter.dto.*;
import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
@@ -201,18 +188,17 @@
walletContractSimulate.setWalletCode(CoinTypeEnum.USDT.name());
memberWalletContractSimulateDao.insert(walletContractSimulate);
+ //初始化合约钱包
+ MemberWalletContractEntity walletContract = new MemberWalletContractEntity();
+ walletContract.setMemberId(member.getId());
+ walletContract.setAvailableBalance(AppContants.INIT_MONEY);
+ walletContract.setFrozenBalance(AppContants.INIT_MONEY);
+ walletContract.setTotalBalance(AppContants.INIT_MONEY);
+ walletContract.setBorrowedFund(AppContants.INIT_MONEY);
+ walletContract.setWalletCode(CoinTypeEnum.USDT.name());
+ memberWalletContractDao.insert(walletContract);
for (CoinTypeEnum coinTypeEnum : CoinTypeEnum.values()) {
- //初始化合约钱包
- MemberWalletContractEntity walletContract = new MemberWalletContractEntity();
- walletContract.setMemberId(member.getId());
- walletContract.setAvailableBalance(AppContants.INIT_MONEY);
- walletContract.setFrozenBalance(AppContants.INIT_MONEY);
- walletContract.setTotalBalance(AppContants.INIT_MONEY);
- walletContract.setBorrowedFund(AppContants.INIT_MONEY);
- walletContract.setWalletCode(coinTypeEnum.name());
- memberWalletContractDao.insert(walletContract);
-
// 初始化币币钱包
MemberWalletCoinEntity walletCoin = new MemberWalletCoinEntity();
walletCoin.setWalletCode(coinTypeEnum.name());
@@ -804,6 +790,9 @@
memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
}
+ Integer fingerprintState = member.getFingerprintState();
+ memberPersonCenterInfoVo.setFingerprintState(fingerprintState);
+
return Result.ok(memberPersonCenterInfoVo);
}
@@ -910,6 +899,7 @@
memberCoinWithdrawEntity.setFeeAmount(memberSubmitCoinApplyDto.getFeeAmount());
memberCoinWithdrawEntity.setSymbol(memberSubmitCoinApplyDto.getSymbol());
memberCoinWithdrawEntity.setMemberId(memberId);
+ memberCoinWithdrawEntity.setLabel(memberSubmitCoinApplyDto.getLable());
memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
Map<String, Object> columnMap = new HashMap<>();
@@ -1063,6 +1053,7 @@
memberCoinWithdrawEntity.setMemberId(memberId);
memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
+ memberCoinWithdrawEntity.setLabel(memberSubmitCoinApplyInDto.getLable());
memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
BigDecimal subtract = walletCoin.getAvailableBalance().subtract(coinNumber);
walletCoin.setAvailableBalance(subtract);
@@ -1140,6 +1131,35 @@
return Result.ok(arrayList);
}
+ @Override
+ public Result memberFingerprintState(@Valid MemberFingerprintStateDto memberFingerprintStateDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+
+ String password = memberFingerprintStateDto.getPassword();
+ MemberEntity member = memberDao.selectById(memberId);
+ if(!password.equals(member.getPassword())){
+ return Result.fail(MessageSourceUtils.getString("home_service_0005"));
+ }
+
+ Integer fingerprintState = memberFingerprintStateDto.getFingerprintState();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+ memberEntity.setFingerprintState(fingerprintState);
+ memberDao.updateById(memberEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }
+
+ @Override
+ public Result memberMessageReminder() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberSettingEntity selectById = memberSettingDao.selectById(memberId);
+ MemberMessageReminderVo memberMessageReminderVo = new MemberMessageReminderVo();
+ memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
+ return Result.ok(memberMessageReminderVo);
+ }
+
+
}
--
Gitblit v1.9.1