From 11cb582d69d25bbfea5b62df940ace93aa1dbe4f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 21:23:05 +0800
Subject: [PATCH] 合约持仓方法添加
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 204 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 144 insertions(+), 60 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..fb01e03 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
@@ -12,11 +12,14 @@
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.dto.RegisterDto;
+import com.xcong.excoin.common.system.service.CommonService;
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;
+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;
@@ -24,21 +27,24 @@
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;
+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;
@@ -73,7 +79,7 @@
@Resource
MemberAuthenticationDao memberAuthenticationDao;
- @Autowired
+ @Resource
RedisUtils redisUtils;
@Resource
@@ -81,6 +87,15 @@
@Resource
PlatformSymbolsCoinDao platformSymbolsCoinDao;
+
+ @Resource
+ MemberCoinAddressDao memberCoinAddressDao;
+
+ @Resource
+ private CommonService commonservice;
+
+ @Resource
+ private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
@Transactional()
@Override
@@ -147,6 +162,15 @@
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);
+
// 初始化币币钱包
for (CoinTypeEnum coinTypeEnum : CoinTypeEnum.values()) {
@@ -194,33 +218,28 @@
public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
int type = memberForgetPwdDto.getType();
- String phone = memberForgetPwdDto.getPhone();
- String email = memberForgetPwdDto.getEmail();
+ String account = memberForgetPwdDto.getAccount();
String code = memberForgetPwdDto.getCode();
String password = memberForgetPwdDto.getPassword();
Map<String, Object> hashMap = new HashMap<>();
if(type == 1) {
- hashMap.put("phone", phone);
+ hashMap.put("phone", account);
}else {
- hashMap.put("email", email);
+ hashMap.put("email", account);
}
List<MemberEntity> member = memberDao.selectByMap(hashMap);
if (CollUtil.isEmpty(member)) {
return Result.fail(MessageSourceUtils.getString("member_service_0047"));
}
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
+
+ boolean flag = commonservice.verifyCode(account, code);
+ if(flag) {
MemberEntity memberEntity = member.get(0);
memberEntity.setPassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0045"));
- }
- if(type == 1) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
}
return Result.ok(MessageSourceUtils.getString("member_service_0048"));
}
@@ -243,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"));
}
@@ -353,22 +367,27 @@
String code = memberUpdateTradePwdDto.getCode();
String password = memberUpdateTradePwdDto.getPassword();
- String phone = memberUpdateTradePwdDto.getPhone();
- String email = memberUpdateTradePwdDto.getEmail();
+ String account = memberUpdateTradePwdDto.getAccount();
+ String phone = memberEntity.getPhone();
+ String email = memberEntity.getEmail();
int type = memberUpdateTradePwdDto.getType();
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
- memberEntity.setTradePassword(SecureUtil.md5(password));
- memberDao.updateById(memberEntity);
- }else {
+
+ //验证手机号或者邮箱是否是该账户绑定的手机号或者邮箱
+ if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type) && !phone.equals(account)) {
return Result.fail(MessageSourceUtils.getString("member_service_0041"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
+ if(MemberEntity.ACCOUNT_TYPE_EMAIL.equals(type) && !email.equals(account)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0041"));
}
- return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+
+ boolean flag = commonservice.verifyCode(account, code);
+ if (flag) {
+ memberEntity.setTradePassword(SecureUtil.md5(password));
+ memberDao.updateById(memberEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0051"));
+ }
+ return Result.fail(MessageSourceUtils.getString("member_service_0045"));
+
}
@Override
@@ -379,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"));
@@ -402,21 +412,17 @@
String code = memberForgetPwdDto.getCode();
String password = memberForgetPwdDto.getPassword();
- String phone = memberForgetPwdDto.getPhone();
- String email = memberForgetPwdDto.getEmail();
+ String account = memberForgetPwdDto.getAccount();
int type = memberForgetPwdDto.getType();
- boolean verificationCode = verificationCode(type, phone, code, email);
- if(verificationCode) {
+
+ boolean flag = commonservice.verifyCode(account, code);
+ if(flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
}else {
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
}
- if(type == 1) {
- redisUtils.del("SMS_" + phone);
- }else {
- redisUtils.del("EMAIL_" + email);
- }
+
return Result.ok(MessageSourceUtils.getString("member_service_0068"));
}
@@ -492,6 +498,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);
@@ -509,6 +516,7 @@
}
@Override
+ @Transactional
public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
@@ -527,7 +535,6 @@
}
member.setPhone(phone);
memberDao.updateById(member);
- redisUtils.del("SMS_" + member.getPhone());
return Result.ok(MessageSourceUtils.getString("member_service_0014"));
}
@@ -535,6 +542,7 @@
}
@Override
+ @Transactional
public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
//获取用户ID
@@ -543,18 +551,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"));
}
@@ -572,4 +575,85 @@
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());
+ memberCoinAddressVo.setLabel(memberCoinAddressEntity.getLabel());
+ memberCoinAddressVo.setSymbolscoinId(memberCoinAddressEntity.getSymbolscoinId());
+ arrayList.add(memberCoinAddressVo);
+ }
+ }
+ memberCoinAddressListVo.setMemberCoinAddressVo(arrayList);
+
+ return Result.ok(memberCoinAddressListVo);
+ }
+
+ @Override
+ @Transactional
+ public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
+
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ String address = memberAddCoinAddressDto.getAddress();
+ String isBiyict = memberAddCoinAddressDto.getIsBiyict();
+ 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);
+ }
+
+ @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");
+ }
+
}
--
Gitblit v1.9.1