From e41f83ce93b31c3d2ed416a8b45dc493177e6dd8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 12 May 2021 17:51:57 +0800 Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding --- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 9a7fbbb..12a030b 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/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); @@ -872,7 +872,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 +883,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 +925,7 @@ } @Override + @Transactional public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) { //获取用户ID Long memberId = LoginUserUtils.getAppLoginUser().getId(); @@ -1097,7 +1098,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()); -- Gitblit v1.9.1