From e7ce8d314ebd415aa8bf8d93f73aaac035f9858d Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Tue, 30 Jun 2020 15:42:32 +0800
Subject: [PATCH] 快捷卖出接口
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 79 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 35 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 20bd004..31ec2cb 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
@@ -30,19 +30,6 @@
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.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;
-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;
@@ -115,6 +102,9 @@
@Resource
MemberCoinWithdrawDao memberCoinWithdrawDao;
+
+ @Resource
+ AppVersionDao appVersionDao;
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
@@ -229,14 +219,14 @@
MemberEntity memberEntity = memberDao.selectById(memberId);
MemberInfoVo memberInfoVo = new MemberInfoVo();
if (ObjectUtil.isNotEmpty(memberEntity)) {
- String email = memberEntity.getEmail();
- String phone = memberEntity.getPhone();
- if(StrUtil.isNotEmpty(phone)) {
- memberInfoVo.setPhone(phone);
- }else if(StrUtil.isNotEmpty(email)) {
- memberInfoVo.setPhone(email);
- }
-
+ String email = memberEntity.getEmail();
+ String phone = memberEntity.getPhone();
+ if (StrUtil.isNotEmpty(phone)) {
+ memberInfoVo.setPhone(phone);
+ } else if (StrUtil.isNotEmpty(email)) {
+ memberInfoVo.setPhone(email);
+ }
+
memberInfoVo.setInviteId(memberEntity.getInviteId());
}
return Result.ok(memberInfoVo);
@@ -413,6 +403,7 @@
if (flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
+ LoginUserUtils.resetAppLoginUser(memberEntity);
return Result.ok(MessageSourceUtils.getString("member_service_0051"));
}
return Result.fail(MessageSourceUtils.getString("member_service_0045"));
@@ -438,8 +429,7 @@
@Transactional
public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
//获取用户ID
- Long memberId = LoginUserUtils.getAppLoginUser().getId();
- MemberEntity memberEntity = memberDao.selectById(memberId);
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
String code = memberForgetPwdDto.getCode();
String password = memberForgetPwdDto.getPassword();
@@ -450,6 +440,8 @@
if (flag) {
memberEntity.setTradePassword(SecureUtil.md5(password));
memberDao.updateById(memberEntity);
+ // 重置内存中的用户信息
+ LoginUserUtils.resetAppLoginUser(memberEntity);
} else {
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
}
@@ -467,6 +459,17 @@
if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail(MessageSourceUtils.getString("member_service_0077"));
}
+
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
+ if(memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0097"));
+ }
+ }
+ }
String account = memberPaymethodDto.getAccount();
String bank = memberPaymethodDto.getBank();
String name = memberPaymethodDto.getName();
@@ -553,13 +556,9 @@
String code = memberBindPhoneDto.getCode();
MemberEntity member = memberDao.selectById(memberId);
- String smsCode = redisUtils.get("SMS_" + phone) + "";
if (ObjectUtil.isNotEmpty(member)) {
- if (StrUtil.isEmpty(smsCode)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0038"));
- }
- if (!smsCode.equals(code)) {
+ if (!commonservice.verifyCode(phone, code)) {
return Result.fail(MessageSourceUtils.getString("member_service_0013"));
}
member.setPhone(phone);
@@ -608,11 +607,7 @@
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);
- columnMap.put("symbolscoin_id", "2");
- List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol,memberId);
+ List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol, memberId);
MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
List<MemberCoinAddressVo> arrayList = new ArrayList<>();
if (CollUtil.isNotEmpty(selectByMap)) {
@@ -746,8 +741,6 @@
@Override
public Result memberCoinInfoList() {
- //获取用户ID
- Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
@@ -903,6 +896,22 @@
return Result.ok("");
}
+ @Override
+ public Result getAppVersionInfo() {
+ Map<String, Object> columnMap = new HashMap<>();
+ List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
+ List<Object> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(AppVersionEntity appVersionEntity : selectByMap) {
+ AppVersionVo appVersionVo = new AppVersionVo();
+ appVersionVo.setAddress(appVersionEntity.getAddress());
+ appVersionVo.setType(appVersionEntity.getType());
+ appVersionVo.setVersion(appVersionEntity.getVersion());
+ arrayList.add(appVersionVo);
+ }
+ }
+ return Result.ok(arrayList);
+ }
}
--
Gitblit v1.9.1