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

xiaoyong931011

2020-05-31 67725023bcbcdf5a3539f4400927682522303ab7

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

@@ -43,6 +43,7 @@
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;
@@ -77,7 +78,7 @@
    @Resource
    MemberAuthenticationDao memberAuthenticationDao;
    
    @Autowired
    @Resource
    RedisUtils redisUtils;
    
    @Resource
@@ -91,6 +92,9 @@
    
    @Resource
    private CommonService commonservice;

    @Resource
    private MemberWalletContractSimulateDao memberWalletContractSimulateDao;

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


        // 初始化币币钱包
        for (CoinTypeEnum coinTypeEnum : CoinTypeEnum.values()) {