From cc9d558c8cda42d53be7b4545d2f33db26edf777 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 28 May 2020 16:46:18 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 369 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 364 insertions(+), 5 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 cf19f1b..a3a428e 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
@@ -1,11 +1,12 @@
package com.xcong.excoin.modules.member.service.impl;
-import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.asymmetric.Sign;
-import cn.hutool.crypto.asymmetric.SignAlgorithm;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.SymbolEnum;
@@ -13,13 +14,32 @@
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+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.MemberUpdatePwdDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
+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.service.MemberService;
+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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import javax.annotation.Resource;
+import javax.validation.Valid;
/**
* @author wzy
@@ -43,6 +63,15 @@
@Resource
private MemberLevelRateDao memberLevelRateDao;
+
+ @Resource
+ MemberAuthenticationDao memberAuthenticationDao;
+
+ @Autowired
+ RedisUtils redisUtils;
+
+ @Resource
+ MemberPaymentMethodDao memberPaymentMethodDao;
@Transactional()
@Override
@@ -135,9 +164,339 @@
levelRate.setSymbol(symbolEnum.getValue());
memberLevelRateDao.insert(levelRate);
}
-
-
return Result.ok("success");
}
+ @Override
+ public Result getMemberInfo() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+ MemberInfoVo memberInfoVo = new MemberInfoVo();
+ if (ObjectUtil.isNotEmpty(memberEntity)) {
+ memberInfoVo.setPhone(memberEntity.getPhone());
+ memberInfoVo.setInviteId(memberEntity.getInviteId());
+ }
+ return Result.ok(memberInfoVo);
+ }
+
+ @Override
+ @Transactional
+ public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+
+ int type = memberForgetPwdDto.getType();
+ String phone = memberForgetPwdDto.getPhone();
+ String email = memberForgetPwdDto.getEmail();
+ String code = memberForgetPwdDto.getCode();
+ String password = memberForgetPwdDto.getPassword();
+
+ Map<String, Object> hashMap = new HashMap<>();
+ if(type == 1) {
+ hashMap.put("phone", phone);
+ }else {
+ hashMap.put("email", email);
+ }
+ 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) {
+ 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"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberUpdatePwd(@Valid MemberUpdatePwdDto memberUpdatePwdDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+
+ String code = memberUpdatePwdDto.getCode();
+ String password = memberUpdatePwdDto.getPassword();
+ String phone = memberUpdatePwdDto.getPhone();
+ String email = memberUpdatePwdDto.getEmail();
+ int type = memberUpdatePwdDto.getType();
+ boolean verificationCode = verificationCode(type, phone, code, email);
+ if(verificationCode) {
+ memberEntity.setPassword(SecureUtil.md5(password));
+ 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"));
+ }
+
+ /**
+ * 验证输入的验证码
+ * @param type 验证类型1：电话2：邮箱
+ * @param phone
+ * @param email
+ * @param code 验证码
+ * @return
+ */
+ private boolean verificationCode(Integer type,String phone,String code,String email) {
+ boolean verificationCode = false;
+ if(type == 1) {
+ String smsCode = redisUtils.get("SMS_" + phone) + "";
+ if(code.equals(smsCode)) {
+ verificationCode = true;
+ }
+ }else {
+ String emailCode = redisUtils.get("EMAIL_" + email) + "";
+ if(code.equals(emailCode)) {
+ verificationCode = true;
+ }
+ }
+ return verificationCode;
+ }
+
+ @Override
+ @Transactional
+ public Result memberAuthentication(@Valid MemberAuthenticationDto memberAuthenticationDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+ if (ObjectUtil.isNotEmpty(member)) {
+ MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
+ if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0055"));
+ }
+ if (MemberEntity.CERTIFY_STATUS_ING == member.getCertifyStatus()) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0056"));
+ }
+ memberAuthenticationEntity.setMemberId(memberId);
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getNation())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0057"));
+ }
+ memberAuthenticationEntity.setNation(memberAuthenticationDto.getNation());
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getFirstName())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0058"));
+ }
+ memberAuthenticationEntity.setFirstName(memberAuthenticationDto.getFirstName());
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getSecondName())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0059"));
+ }
+ memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
+
+ String idCardNo = memberAuthenticationDto.getIdCardNo();
+ if (StrUtil.isBlank(idCardNo)) {
+ 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"));
+ }
+ if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
+ || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
+ || StrUtil.isBlank(memberAuthenticationDto.getIdCardImage())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0061"));
+ }
+ memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
+ memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
+ memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
+ memberAuthenticationDao.insert(memberAuthenticationEntity);
+
+ member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
+ member.setIdcardNo(idCardNo);
+ memberDao.updateById(member);
+ /**
+ * TODO dingtalk
+
+ Constant.excutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ DingTalkUtils.sendActionCard(4);
+ }
+ });*/
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }
+ return Result.fail(MessageSourceUtils.getString("member_service_0063"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberUpdateTradePwd(@Valid MemberUpdateTradePwdDto memberUpdateTradePwdDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+
+ String code = memberUpdateTradePwdDto.getCode();
+ String password = memberUpdateTradePwdDto.getPassword();
+ String phone = memberUpdateTradePwdDto.getPhone();
+ String email = memberUpdateTradePwdDto.getEmail();
+ int type = memberUpdateTradePwdDto.getType();
+ boolean verificationCode = verificationCode(type, phone, code, email);
+ if(verificationCode) {
+ memberEntity.setTradePassword(SecureUtil.md5(password));
+ 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_0051"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberLogout() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ 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"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberTradersPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+
+ String code = memberForgetPwdDto.getCode();
+ String password = memberForgetPwdDto.getPassword();
+ String phone = memberForgetPwdDto.getPhone();
+ String email = memberForgetPwdDto.getEmail();
+ int type = memberForgetPwdDto.getType();
+ boolean verificationCode = verificationCode(type, phone, code, email);
+ if(verificationCode) {
+ 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"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberAddPaymethod(@Valid MemberPaymethodDto memberPaymethodDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+
+ if(!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0077"));
+ }
+ String account = memberPaymethodDto.getAccount();
+ String bank = memberPaymethodDto.getBank();
+ String name = memberPaymethodDto.getName();
+ String paymentQrcode = memberPaymethodDto.getPaymentQrcode();
+ String paymentType = memberPaymethodDto.getPaymentType();
+ String subBank = memberPaymethodDto.getSubBank();
+ String isDefualt = memberPaymethodDto.getIsDefualt();
+ MemberPaymentMethodEntity memberPaymentMethodEntity = new MemberPaymentMethodEntity();
+ memberPaymentMethodEntity.setMemberId(memberId);
+ memberPaymentMethodEntity.setAccount(account);
+ memberPaymentMethodEntity.setBank(bank);
+ memberPaymentMethodEntity.setName(name);
+ memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
+ memberPaymentMethodEntity.setPaymentType(paymentType);
+ memberPaymentMethodEntity.setSubBank(subBank);
+ memberPaymentMethodEntity.setIsDefualt(isDefualt);
+ memberPaymentMethodDao.insert(memberPaymentMethodEntity);
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }
+
+ @Override
+ @Transactional
+ public Result memberDelPaymethod(@Valid MemberDelPaymethodDto memberDelPaymethodDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ Long id = memberDelPaymethodDto.getId();
+ Map<String,Object> columnMap = new HashMap<>();
+ columnMap.put("id", id);
+ columnMap.put("member_id", memberId);
+ memberPaymentMethodDao.deleteByMap(columnMap);
+ return Result.ok("success");
+ }
+
+ @Override
+ public Result memberPaymethodDetail(long id) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberPaymentMethodEntity memberPaymentMethod = memberPaymentMethodDao.selectById(id);
+
+ MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
+ memberPaymethodDetailVo.setAccount(memberPaymentMethod.getAccount());
+ memberPaymethodDetailVo.setBank(memberPaymentMethod.getBank());
+ memberPaymethodDetailVo.setMemberId(memberId);
+ memberPaymethodDetailVo.setName(memberPaymentMethod.getName());
+ memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethod.getPaymentQrcode());
+ memberPaymethodDetailVo.setPaymentType(memberPaymentMethod.getPaymentType());
+ memberPaymethodDetailVo.setSubBank(memberPaymentMethod.getSubBank());
+
+ return Result.ok(memberPaymethodDetailVo);
+ }
+
+ @Override
+ public Result memberPaymethodDetailList() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ Map<String,Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
+ List<MemberPaymethodDetailVo> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
+ MemberPaymethodDetailVo memberPaymethodDetailVo = new MemberPaymethodDetailVo();
+ memberPaymethodDetailVo.setAccount(memberPaymentMethodEntity.getAccount());
+ memberPaymethodDetailVo.setBank(memberPaymentMethodEntity.getBank());
+ memberPaymethodDetailVo.setMemberId(memberId);
+ memberPaymethodDetailVo.setName(memberPaymentMethodEntity.getName());
+ memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
+ memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
+ memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
+ arrayList.add(memberPaymethodDetailVo);
+ }
+ }
+
+ MemberPaymethodDetailListVo memberPaymethodDetailListVo = new MemberPaymethodDetailListVo();
+ memberPaymethodDetailListVo.setMemberPaymethodDetailVo(arrayList);
+ return Result.ok(memberPaymethodDetailListVo);
+ }
+
}
--
Gitblit v1.9.1