modify

Helius

2021-05-13 fe74a0d3c209b328905c3f103f1733146e44bcac

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

@@ -174,9 +174,9 @@
        memberDao.insert(member);

        MemberSettingEntity memberSettingEntity = new MemberSettingEntity();
        memberSettingEntity.setSpread(BigDecimal.ONE);
        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(5));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0055));
        memberSettingEntity.setSpread(BigDecimal.valueOf(0.5));
        memberSettingEntity.setClosingSpread(BigDecimal.valueOf(2));
        memberSettingEntity.setForceParam(BigDecimal.valueOf(0.0085));
        memberSettingEntity.setMemberId(member.getId());
        memberSettingDao.insert(memberSettingEntity);

@@ -861,9 +861,11 @@
        List<MemberCoinInfoVo> arrayList = new ArrayList<>();
        if (CollUtil.isNotEmpty(selectByMap)) {
            for (PlatformSymbolsCoinEntity platformSymbolsCoinEntity : selectByMap) {
                MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
                memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
                arrayList.add(memberCoinInfoVo);
                if ("XCH".equals(platformSymbolsCoinEntity.getName()) || "USDT".equals(platformSymbolsCoinEntity.getName())) {
                    MemberCoinInfoVo memberCoinInfoVo = new MemberCoinInfoVo();
                    memberCoinInfoVo.setName(platformSymbolsCoinEntity.getName());
                    arrayList.add(memberCoinInfoVo);
                }
            }
        }
        memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
@@ -872,7 +874,7 @@
    }

    @Override
    public Result memberAvivableCoinInfo(String symbol) {
    public Result memberAvivableCoinInfo(String symbol,String lable) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
@@ -883,7 +885,7 @@
        List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();


        List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
        List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol,lable);
        if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
            return Result.fail(MessageSourceUtils.getString("member_service_0087"));
        }
@@ -925,6 +927,7 @@
    }

    @Override
    @Transactional
    public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
@@ -1097,7 +1100,11 @@
                addressIn = address;
         } else {
                MemberCoinAddressEntity memberCoinAddressEntity = selectByMap2.get(0);
                addressIn = memberCoinAddressEntity.getAddress();
                if(StrUtil.isEmpty(memberCoinAddressEntity.getAddress())){
                    addressIn = selectMemberInfoByAccount.getInviteId();
                }else{
                    addressIn = memberCoinAddressEntity.getAddress();
                }
            }
           
            MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, memberSubmitCoinApplyInDto.getSymbol());