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

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

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

@@ -118,6 +118,11 @@
            return Result.fail("账号已存在");
        }

        boolean isTrue = commonservice.verifyCode(registerDto.getAccount(), registerDto.getCode());
        if (!isTrue) {
            return Result.fail(MessageSourceUtils.getString("common_verify_code"));
        }

        member = new MemberEntity();
        member.setPassword(SecureUtil.md5(registerDto.getPassword()));

@@ -134,7 +139,7 @@
//        if (StrUtil.isBlank(registerDto.getRefererId())) {
//            registerDto.setRefererId(AppContants.SYSTEM_REFERER);
//        }
        if (!registerDto.getRefererId().equals(AppContants.SYSTEM_REFERER)) {
        if (!AppContants.SYSTEM_REFERER.equals(registerDto.getRefererId())) {
            MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
            if (isExist == null) {
                return Result.fail("推荐人不存在");
@@ -327,13 +332,9 @@
         return Result.fail(MessageSourceUtils.getString("member_service_4000"));
      }
        if (ObjectUtil.isNotEmpty(member)) {
           Map<String, Object> columnMap = new HashMap<>();
           columnMap.put("member_id", memberId);
        	
           MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
         List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
           if(CollUtil.isNotEmpty(selectByMap)) {
              memberAuthenticationEntity = selectByMap.get(0);
           }
			
            if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
                return Result.fail(MessageSourceUtils.getString("member_service_0055"));
            }
@@ -378,7 +379,16 @@
            memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
            memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
            memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
            memberAuthenticationDao.insert(memberAuthenticationEntity);
            
            Map<String, Object> columnMap = new HashMap<>();
           columnMap.put("member_id", memberId);
           List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
           if(CollUtil.isEmpty(selectByMap)) {
              memberAuthenticationDao.insert(memberAuthenticationEntity);
           }else {
              memberAuthenticationEntity.setId(selectByMap.get(0).getId());
              memberAuthenticationDao.updateById(memberAuthenticationEntity);
           }

            member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
            member.setIdcardNo(idCardNo);
@@ -881,7 +891,7 @@
            BigDecimal availableBalance = walletCoin.getAvailableBalance();
            BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber();
            if (availableBalance.compareTo(BigDecimal.ZERO) > 0
                    && availableBalance.compareTo(coinNumber) > 0) {
                    && availableBalance.compareTo(coinNumber) >= 0) {
                //新增提币记录
                MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
                memberCoinWithdrawEntity.setAddress(memberSubmitCoinApplyDto.getAddress());