20200529 代码提交

xiaoyong931011

2020-05-29 e46725dbcd18577593fe9c6d8fedee3ce29e6dc8

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -14,22 +14,30 @@
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.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.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.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.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
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;
@@ -73,6 +81,12 @@
    
    @Resource
    MemberPaymentMethodDao memberPaymentMethodDao;
    
    @Resource
    PlatformSymbolsCoinDao platformSymbolsCoinDao;
    
    @Resource
    MemberCoinAddressDao memberCoinAddressDao;

    @Transactional()
    @Override
@@ -319,7 +333,7 @@
                memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
                memberAuthenticationDao.insert(memberAuthenticationEntity);
                
                member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_Y);
                member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
                member.setIdcardNo(idCardNo);
                memberDao.updateById(member);
                /**
@@ -345,8 +359,8 @@
      
      String code = memberUpdateTradePwdDto.getCode();
      String password = memberUpdateTradePwdDto.getPassword();
      String phone = memberUpdateTradePwdDto.getPhone();
      String email = memberUpdateTradePwdDto.getEmail();
      String phone = memberEntity.getPhone();
      String email = memberEntity.getEmail();
      int type = memberUpdateTradePwdDto.getType();
      boolean verificationCode = verificationCode(type, phone, code, email);
      if(verificationCode) {
@@ -526,4 +540,75 @@
        return Result.fail(MessageSourceUtils.getString("member_service_0015"));
    }

   @Override
   public Result memberBindEmail(@Valid MemberBindEmailDto memberBindEmailDto) {
		
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
      String email = memberBindEmailDto.getEmail();
      String code = memberBindEmailDto.getCode();
				
      MemberEntity member = memberDao.selectById(memberId);
      String verifyCode = (String)redisUtils.get("EMAIL_" + email);
      if (ObjectUtil.isNotEmpty(member)) {
         if (StringUtils.isBlank(verifyCode)) {
              return Result.fail(MessageSourceUtils.getString("member_service_0012"));
          }
          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"));
    }

   @Override
   public Result memberCoinAddressCount() {
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
      List<MemberCoinAddressCountVo> list = platformSymbolsCoinDao.selectCoinAddressCount(memberId);
      MemberCoinAddressCountListVo memberCoinAddressCountListVo = new MemberCoinAddressCountListVo();
      if(CollUtil.isNotEmpty(list)) {
         memberCoinAddressCountListVo.setMemberCoinAddressCountVo(list);
         return Result.ok(memberCoinAddressCountListVo);
      }
        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());
            arrayList.add(memberCoinAddressVo);
         }
      }
      memberCoinAddressListVo.setMemberCoinAddressVo(arrayList);
		
      return Result.ok(memberCoinAddressListVo);
   }

   @Override
   public Result memberAddCoinAddress(@Valid MemberAddCoinAddressDto memberAddCoinAddressDto) {
      // TODO Auto-generated method stub
      return null;
   }

}