From d87e33a32299c406bf96ee62ac2014e190cb12de Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 16:57:21 +0800
Subject: [PATCH] 实体类常量提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 81 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 43 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 8477168..1f3d59b 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
@@ -31,18 +31,20 @@
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.MemberSendCodeWayVo;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
+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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -77,7 +79,7 @@
@Resource
MemberAuthenticationDao memberAuthenticationDao;
- @Autowired
+ @Resource
RedisUtils redisUtils;
@Resource
@@ -91,6 +93,9 @@
@Resource
private CommonService commonservice;
+
+ @Resource
+ private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
@Transactional()
@Override
@@ -156,6 +161,15 @@
walletContract.setBorrowedFund(AppContants.INIT_MONEY);
walletContract.setWalletCode(CoinTypeEnum.USDT.name());
memberWalletContractDao.insert(walletContract);
+
+ MemberWalletContractSimulateEntity walletContractSimulate = new MemberWalletContractSimulateEntity();
+ walletContractSimulate.setMemberId(member.getId());
+ walletContractSimulate.setAvailableBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+ walletContractSimulate.setTotalBalance(new BigDecimal(AppContants.INIT_SIMULATE_MONEY));
+ walletContractSimulate.setFrozenBalance(AppContants.INIT_MONEY);
+ walletContractSimulate.setBorrowedFund(AppContants.INIT_MONEY);
+ walletContractSimulate.setWalletCode(CoinTypeEnum.USDT.name());
+ memberWalletContractSimulateDao.insert(walletContractSimulate);
// 初始化币币钱包
@@ -227,11 +241,6 @@
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + account);
- }else {
- redisUtils.del("EMAIL_" + account);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0048"));
}
@@ -253,11 +262,6 @@
memberDao.updateById(memberEntity);
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0041"));
- }
- if(type == 1) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
}
return Result.ok(MessageSourceUtils.getString("member_service_0040"));
}
@@ -380,14 +384,9 @@
if (flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
- if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type)) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0051"));
}
- return Result.fail(MessageSourceUtils.getString("member_service_0041"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0045"));
}
@@ -399,15 +398,6 @@
MemberEntity memberEntity = memberDao.selectById(memberId);
if (ObjectUtil.isEmpty(memberEntity)) {
return Result.fail(MessageSourceUtils.getString("member_service_0003"));
- }
-
- String phone = memberEntity.getPhone();
- if(StrUtil.isEmpty(phone)) {
- redisUtils.del(memberEntity.getPhone());
- }
- String email = memberEntity.getEmail();
- if(StrUtil.isEmpty(email)) {
- redisUtils.del(memberEntity.getPhone());
}
return Result.ok(MessageSourceUtils.getString("member_service_0071"));
@@ -433,11 +423,6 @@
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + account);
- }else {
- redisUtils.del("EMAIL_" + account);
- }
return Result.ok(MessageSourceUtils.getString("member_service_0068"));
}
@@ -549,7 +534,6 @@
}
member.setPhone(phone);
memberDao.updateById(member);
- redisUtils.del("SMS_" + member.getPhone());
return Result.ok(MessageSourceUtils.getString("member_service_0014"));
}
@@ -566,18 +550,13 @@
String code = memberBindEmailDto.getCode();
MemberEntity member = memberDao.selectById(memberId);
- String verifyCode = (String)redisUtils.get("EMAIL_" + email);
+ boolean flag = commonservice.verifyCode(email, code);
if (ObjectUtil.isNotEmpty(member)) {
- if (StringUtils.isBlank(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0012"));
+ if (flag) {
+ member.setEmail(email);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
- if (!code.equals(verifyCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0039"));
- }
- member.setEmail(email);
- memberDao.updateById(member);
- redisUtils.del("EMAIL_" + member.getPhone());
- return Result.ok(MessageSourceUtils.getString("member_service_0018"));
}
return Result.fail(MessageSourceUtils.getString("member_service_0019"));
}
@@ -635,16 +614,32 @@
Long symbolscoinId = memberAddCoinAddressDto. getSymbolscoinId();
String remark = memberAddCoinAddressDto.getRemark();
+ PlatformSymbolsCoinEntity platformSymbolsCoinEntity = platformSymbolsCoinDao.selectById(symbolscoinId);
+
MemberCoinAddressEntity memberCoinAddressEntity = new MemberCoinAddressEntity();
memberCoinAddressEntity.setAddress(address);
memberCoinAddressEntity.setMemberId(memberId);
memberCoinAddressEntity.setIsBiyict(isBiyict);
memberCoinAddressEntity.setSymbolscoinId(symbolscoinId);
memberCoinAddressEntity.setLabel(remark);
+ memberCoinAddressEntity.setSymbol(platformSymbolsCoinEntity.getName());
memberCoinAddressDao.insert(memberCoinAddressEntity);
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
+ @Override
+ public Result memberSendCodeWay() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+ MemberSendCodeWayVo memberSendCodeWayVo = new MemberSendCodeWayVo();
+ if(ObjectUtil.isNotEmpty(member)) {
+ memberSendCodeWayVo.setPhone(member.getPhone());
+ memberSendCodeWayVo.setEmail(member.getEmail());
+ }
+ return Result.ok(memberSendCodeWayVo);
+ }
+
}
--
Gitblit v1.9.1