Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git i...

xiaoyong931011

2020-11-30 78d39c4e43c80ea16cc96dc73d60c8880ac5020d

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

@@ -472,6 +472,8 @@
        if (flag) {
            memberEntity.setTradePassword(SecureUtil.md5(password));
            memberDao.updateById(memberEntity);
            wtWallet.setPassword(SecureUtil.md5(password));
            wtWalletDao.updateByModel(wtWallet);
            LoginUserUtils.resetAppLoginUser(memberEntity);
            return Result.ok(MessageSourceUtils.getString("member_service_0051"));
        }
@@ -928,6 +930,7 @@
        return Result.ok("success");
    }

    @Transactional
    @Override
    public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
        //获取用户ID
@@ -1205,6 +1208,17 @@
        
        memberDao.updateById(member);

        // 插入ser地址
        MemberCoinAddressEntity coinAddress = new MemberCoinAddressEntity();
        coinAddress.setAddress(address);
        coinAddress.setIsBiyict(MemberCoinAddressEntity.IS_BIYICT_YES);
        coinAddress.setMemberId(member.getId());
        coinAddress.setPrivateKey(privateKey);
        coinAddress.setSymbol(SymbolEnum.SER.name());
        coinAddress.setLabel(member.getInviteId());
        memberCoinAddressDao.insert(coinAddress);


        //初始化合约钱包
        MemberWalletContractEntity walletContract = new MemberWalletContractEntity();
        walletContract.setMemberId(member.getId());
@@ -1419,6 +1433,22 @@
        }
        return Result.ok(list);
   }

   @Override
   public Result getMemberTradeCode(String tradeCode) {
      //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity memberEntity = memberDao.selectById(memberId);
        String tradePassword = memberEntity.getTradePassword();
        if(StrUtil.isEmpty(tradePassword)) {
           return Result.fail(MessageSourceUtils.getString("member_controller_0002"));
        }
        if(!SecureUtil.md5(tradeCode).equals(tradePassword)) {
           return Result.fail(MessageSourceUtils.getString("member_controller_0004"));
        }
        
        return Result.ok("");
   }
}