modify

Helius

2020-07-06 5dcc5bf3b578631ef3c254a44abfdd5545523db9

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

@@ -134,9 +134,11 @@
//        if (StrUtil.isBlank(registerDto.getRefererId())) {
//            registerDto.setRefererId(AppContants.SYSTEM_REFERER);
//        }
        MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
        if (isExist == null) {
            return Result.fail("推荐人不存在");
        if (!registerDto.getRefererId().equals(AppContants.SYSTEM_REFERER)) {
            MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
            if (isExist == null) {
                return Result.fail("推荐人不存在");
            }
        }

        member.setRefererId(registerDto.getRefererId());
@@ -146,6 +148,7 @@
        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
        member.setIsForce(0);
        member.setIsProfit(0);
        member.setSpread(BigDecimal.ZERO);
        memberDao.insert(member);

        String inviteId = ShareCodeUtil.toSerialCode(member.getId());
@@ -324,7 +327,13 @@
         return Result.fail(MessageSourceUtils.getString("member_service_4000"));
      }
        if (ObjectUtil.isNotEmpty(member)) {
            MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
           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"));
            }
@@ -804,15 +813,22 @@
            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
        }

        MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
        memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());

        PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2, symbol);
        if (ObjectUtil.isEmpty(feeSetting)) {
        List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
        
        
      List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
        if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
        }
        memberAvivableCoinInfoVo.setFee(feeSetting.getFeePrice());
        return Result.ok(memberAvivableCoinInfoVo);
        for(PlatformFeeSettingEntity platformFeeSettingEntity : feeSettingByTypeAndSymbolLable) {
           MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
           memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
           memberAvivableCoinInfoVo.setFee(platformFeeSettingEntity.getFeePrice());
           memberAvivableCoinInfoVo.setLable(platformFeeSettingEntity.getLable());
           arrayList.add(memberAvivableCoinInfoVo);
        }
        
        return Result.ok(arrayList);
    }

    @Override
@@ -863,7 +879,7 @@
        if (flag) {
            MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyDto.getSymbol());
            BigDecimal availableBalance = walletCoin.getAvailableBalance();
            BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber().add(memberSubmitCoinApplyDto.getFeeAmount());
            BigDecimal coinNumber = memberSubmitCoinApplyDto.getCoinNumber();
            if (availableBalance.compareTo(BigDecimal.ZERO) > 0
                    && availableBalance.compareTo(coinNumber) > 0) {
                //新增提币记录
@@ -894,7 +910,7 @@
                MemberAccountMoneyChange accountRecord = new MemberAccountMoneyChange();
                accountRecord.setContent("提币");
                accountRecord.setMemberId(memberId);
                accountRecord.setAmount(memberSubmitCoinApplyDto.getCoinNumber());
                accountRecord.setAmount(coinNumber);
                accountRecord.setStatus(MemberAccountMoneyChange.STATUS_WAIT_INTEGER);
                accountRecord.setSymbol(memberSubmitCoinApplyDto.getSymbol());
                accountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);