20200531 代码提交

xiaoyong931011

2020-05-31 824e1fcb72ba51a084f36c0e812dd65d50edb9d8

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

@@ -31,6 +31,7 @@
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;
@@ -39,11 +40,11 @@
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;
@@ -78,7 +79,7 @@
    @Resource
    MemberAuthenticationDao memberAuthenticationDao;
    
    @Autowired
    @Resource
    RedisUtils redisUtils;
    
    @Resource
@@ -92,6 +93,9 @@
    
    @Resource
    private CommonService commonservice;

    @Resource
    private MemberWalletContractSimulateDao memberWalletContractSimulateDao;

    @Transactional()
    @Override
@@ -157,6 +161,15 @@
        walletContract.setBorrowedFund(AppContants.INIT_MONEY);
        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);


        // 初始化币币钱包
@@ -228,11 +241,6 @@
      }else {
         return Result.fail(MessageSourceUtils.getString("member_service_0045"));
      }
      if(type == 1) {
         redisUtils.del("SMS_" + account);
      }else {
         redisUtils.del("EMAIL_" + account);
      }
        return Result.ok(MessageSourceUtils.getString("member_service_0048"));
    }
   
@@ -254,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"));
    }
@@ -381,11 +384,6 @@
        if (flag) {
           memberEntity.setTradePassword(SecureUtil.md5(password));
           memberDao.updateById(memberEntity);
           if(MemberEntity.ACCOUNT_TYPE_PHONE.equals(type)) {
              redisUtils.del("SMS_" + phone);
           }else {
              redisUtils.del("EMAIL_" + email);
           }
           return Result.ok(MessageSourceUtils.getString("member_service_0051"));
        }
        return Result.fail(MessageSourceUtils.getString("member_service_0041"));
@@ -400,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"));
@@ -434,11 +423,6 @@
         return Result.fail(MessageSourceUtils.getString("member_service_0015"));
      }
      
      if(type == 1) {
         redisUtils.del("SMS_" + account);
      }else {
         redisUtils.del("EMAIL_" + account);
      }
        return Result.ok(MessageSourceUtils.getString("member_service_0068"));
    }

@@ -550,7 +534,6 @@
            }
            member.setPhone(phone);
            memberDao.updateById(member);
            redisUtils.del("SMS_" + member.getPhone());
            return Result.ok(MessageSourceUtils.getString("member_service_0014"));
        }
      
@@ -567,18 +550,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"));
    }
@@ -651,4 +629,17 @@
       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);
   }

}