From b962c7b6635028231fc845f070ca2e3724403948 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Jul 2020 19:53:53 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 132 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 50 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 044d8f6..97c1ad7 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;
@@ -132,17 +122,21 @@
member.setPassword(SecureUtil.md5(registerDto.getPassword()));
// 判断账号类型
- if (MemberEntity.ACCOUNT_TYPE_PHONE == registerDto.getType()) {
+ if (MemberEntity.ACCOUNT_TYPE_PHONE.equals(registerDto.getType())) {
member.setPhone(registerDto.getAccount());
- } else if (MemberEntity.ACCOUNT_TYPE_EMAIL == registerDto.getType()) {
+ } else if (MemberEntity.ACCOUNT_TYPE_EMAIL.equals(registerDto.getType())) {
member.setEmail(registerDto.getAccount());
} else {
return Result.fail("账号类型错误");
}
// 判断是否拥有推荐人，若为空则默认系统
- if (StrUtil.isBlank(registerDto.getRefererId())) {
- registerDto.setRefererId(AppContants.SYSTEM_REFERER);
+// if (StrUtil.isBlank(registerDto.getRefererId())) {
+// registerDto.setRefererId(AppContants.SYSTEM_REFERER);
+// }
+ MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
+ if (isExist == null) {
+ return Result.fail("推荐人不存在");
}
member.setRefererId(registerDto.getRefererId());
@@ -229,14 +223,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);
@@ -350,16 +344,19 @@
return Result.fail(MessageSourceUtils.getString("member_service_0059"));
}
memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
-
+
+ String type = memberAuthenticationDto.getType();
+ memberAuthenticationEntity.setType(type);
+
String idCardNo = memberAuthenticationDto.getIdCardNo();
if (StrUtil.isBlank(idCardNo)) {
- return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0060"));
}
memberAuthenticationEntity.setIdcardNo(idCardNo);
//同一个身份证号码不能重复实名认证
int count = memberAuthenticationDao.findMemberbyIdCardNoCount(idCardNo);
if (count > 0) {
- return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0060"));
}
if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
|| StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
@@ -413,6 +410,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 +436,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 +447,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 +466,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();
@@ -547,24 +557,27 @@
@Override
@Transactional
public Result memberBindPhone(@Valid MemberBindPhoneDto memberBindPhoneDto) {
- //获取用户ID
+ //获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
String phone = memberBindPhoneDto.getPhone();
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);
- memberDao.updateById(member);
- return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("phone", phone);
+ List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
+ if(CollUtil.isEmpty(selectByMap)) {
+ member.setPhone(phone);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0014"));
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+ }
}
return Result.fail(MessageSourceUtils.getString("member_service_0015"));
@@ -574,7 +587,7 @@
@Transactional
public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
- //获取用户ID
+ //获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
String email = memberBindEmailDto.getEmail();
String code = memberBindEmailDto.getCode();
@@ -583,9 +596,16 @@
boolean flag = commonservice.verifyCode(email, code);
if (ObjectUtil.isNotEmpty(member)) {
if (flag) {
- member.setEmail(email);
- memberDao.updateById(member);
- return Result.ok(MessageSourceUtils.getString("member_service_0018"));
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("email", email);
+ List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
+ if(CollUtil.isEmpty(selectByMap)) {
+ member.setEmail(email);
+ memberDao.updateById(member);
+ return Result.ok(MessageSourceUtils.getString("member_service_0018"));
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_1400"));
+ }
}
}
return Result.fail(MessageSourceUtils.getString("member_service_0019"));
@@ -608,10 +628,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);
- List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectByMap(columnMap);
+ List<MemberCoinAddressEntity> selectByMap = memberCoinAddressDao.selectCoinAddressListByMap(symbol, memberId);
MemberCoinAddressListVo memberCoinAddressListVo = new MemberCoinAddressListVo();
List<MemberCoinAddressVo> arrayList = new ArrayList<>();
if (CollUtil.isNotEmpty(selectByMap)) {
@@ -703,6 +720,7 @@
memberAuthnticationInfoVo.setSecondName(memberAuthenticationEntity.getSecondName());
memberAuthnticationInfoVo.setNation(memberAuthenticationEntity.getNation());
memberAuthnticationInfoVo.setIdCardNo(memberAuthenticationEntity.getIdcardNo());
+ memberAuthnticationInfoVo.setType(memberAuthenticationEntity.getType());
}
}
return Result.ok(memberAuthnticationInfoVo);
@@ -745,8 +763,6 @@
@Override
public Result memberCoinInfoList() {
- //获取用户ID
- Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
@@ -877,7 +893,7 @@
*/
return Result.ok(MessageSourceUtils.getString("member_service_0086"));
} else {
- return Result.fail(MessageSourceUtils.getString("order_service_0040"));
+ return Result.fail(MessageSourceUtils.getString("member_service_0005"));
}
} else {
@@ -902,6 +918,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