From e4f129a3edeaeba4d717fc61f856d283b8e0f30b Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 15 Oct 2020 17:05:31 +0800 Subject: [PATCH] 20201015 --- src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 85 ++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java index efe013f..1be5517 100644 --- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java @@ -874,20 +874,13 @@ for(MemberAccountInfoVo memberAccountInfoVo : records) { Long memberId = memberAccountInfoVo.getId(); - List<MemberAccountInfoVo> walletContracts = memberMapper.selectWalletContractByMemberId(memberId); - BigDecimal walletAvailableBalance = BigDecimal.ZERO; - BigDecimal walletTotalBalance = BigDecimal.ZERO; - BigDecimal walletFrozenBalance = BigDecimal.ZERO; - if(CollUtil.isNotEmpty(walletContracts)) { - for(MemberAccountInfoVo walletContract : walletContracts) { - walletAvailableBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletAvailableBalance()).add(walletAvailableBalance); - walletTotalBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletTotalBalance()).add(walletTotalBalance); - walletFrozenBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletFrozenBalance()).add(walletFrozenBalance); - } - memberAccountInfoVo.setWalletAvailableBalance(walletAvailableBalance); - memberAccountInfoVo.setWalletTotalBalance(walletTotalBalance); - memberAccountInfoVo.setWalletFrozenBalance(walletFrozenBalance); - } + String walletAvailableBalance = memberMapper.selectWalletAvailableBalanceBymemberId(memberId); + String walletTotalBalance = memberMapper.selectWalletTotalBalanceBymemberId(memberId); + String walletFrozenBalance = memberMapper.selectWalletFrozenBalanceBymemberId(memberId); + + memberAccountInfoVo.setWalletCoinAvailableBalance(new BigDecimal(walletAvailableBalance)); + memberAccountInfoVo.setWalletCoinTotalBalance(new BigDecimal(walletTotalBalance)); + memberAccountInfoVo.setWalletCoinFrozenBalance(new BigDecimal(walletFrozenBalance)); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); @@ -931,20 +924,13 @@ for(MemberAccountInfoVo memberAccountInfoVo : records) { Long memberId = memberAccountInfoVo.getId(); - List<MemberAccountInfoVo> walletContracts = memberMapper.selectWalletContractByMemberId(memberId); - BigDecimal walletAvailableBalance = BigDecimal.ZERO; - BigDecimal walletTotalBalance = BigDecimal.ZERO; - BigDecimal walletFrozenBalance = BigDecimal.ZERO; - if(CollUtil.isNotEmpty(walletContracts)) { - for(MemberAccountInfoVo walletContract : walletContracts) { - walletAvailableBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletAvailableBalance()).add(walletAvailableBalance); - walletTotalBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletTotalBalance()).add(walletTotalBalance); - walletFrozenBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletFrozenBalance()).add(walletFrozenBalance); - } - memberAccountInfoVo.setWalletAvailableBalance(walletAvailableBalance); - memberAccountInfoVo.setWalletTotalBalance(walletTotalBalance); - memberAccountInfoVo.setWalletFrozenBalance(walletFrozenBalance); - } + String walletAvailableBalance = memberMapper.selectWalletAvailableBalanceBymemberId(memberId); + String walletTotalBalance = memberMapper.selectWalletTotalBalanceBymemberId(memberId); + String walletFrozenBalance = memberMapper.selectWalletFrozenBalanceBymemberId(memberId); + + memberAccountInfoVo.setWalletCoinAvailableBalance(new BigDecimal(walletAvailableBalance)); + memberAccountInfoVo.setWalletCoinTotalBalance(new BigDecimal(walletTotalBalance)); + memberAccountInfoVo.setWalletCoinFrozenBalance(new BigDecimal(walletFrozenBalance)); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); @@ -988,20 +974,13 @@ for(MemberAccountInfoVo memberAccountInfoVo : records) { Long memberId = memberAccountInfoVo.getId(); - List<MemberAccountInfoVo> walletContracts = memberMapper.selectWalletContractByMemberId(memberId); - BigDecimal walletAvailableBalance = BigDecimal.ZERO; - BigDecimal walletTotalBalance = BigDecimal.ZERO; - BigDecimal walletFrozenBalance = BigDecimal.ZERO; - if(CollUtil.isNotEmpty(walletContracts)) { - for(MemberAccountInfoVo walletContract : walletContracts) { - walletAvailableBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletAvailableBalance()).add(walletAvailableBalance); - walletTotalBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletTotalBalance()).add(walletTotalBalance); - walletFrozenBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletFrozenBalance()).add(walletFrozenBalance); - } - memberAccountInfoVo.setWalletAvailableBalance(walletAvailableBalance); - memberAccountInfoVo.setWalletTotalBalance(walletTotalBalance); - memberAccountInfoVo.setWalletFrozenBalance(walletFrozenBalance); - } + String walletAvailableBalance = memberMapper.selectWalletAvailableBalanceBymemberId(memberId); + String walletTotalBalance = memberMapper.selectWalletTotalBalanceBymemberId(memberId); + String walletFrozenBalance = memberMapper.selectWalletFrozenBalanceBymemberId(memberId); + + memberAccountInfoVo.setWalletCoinAvailableBalance(new BigDecimal(walletAvailableBalance)); + memberAccountInfoVo.setWalletCoinTotalBalance(new BigDecimal(walletTotalBalance)); + memberAccountInfoVo.setWalletCoinFrozenBalance(new BigDecimal(walletFrozenBalance)); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); @@ -1044,20 +1023,14 @@ if(records.size() > 0) { for(MemberAccountInfoVo memberAccountInfoVo : records) { Long memberId = memberAccountInfoVo.getId(); - List<MemberAccountInfoVo> walletContracts = memberMapper.selectWalletContractByMemberId(memberId); - BigDecimal walletAvailableBalance = BigDecimal.ZERO; - BigDecimal walletTotalBalance = BigDecimal.ZERO; - BigDecimal walletFrozenBalance = BigDecimal.ZERO; - if(CollUtil.isNotEmpty(walletContracts)) { - for(MemberAccountInfoVo walletContract : walletContracts) { - walletAvailableBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletAvailableBalance()).add(walletAvailableBalance); - walletTotalBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletTotalBalance()).add(walletTotalBalance); - walletFrozenBalance = (ObjectUtil.isEmpty(walletContract.getWalletAvailableBalance()) ? BigDecimal.ZERO:walletContract.getWalletFrozenBalance()).add(walletFrozenBalance); - } - memberAccountInfoVo.setWalletAvailableBalance(walletAvailableBalance); - memberAccountInfoVo.setWalletTotalBalance(walletTotalBalance); - memberAccountInfoVo.setWalletFrozenBalance(walletFrozenBalance); - } + + String walletAvailableBalance = memberMapper.selectWalletAvailableBalanceBymemberId(memberId); + String walletTotalBalance = memberMapper.selectWalletTotalBalanceBymemberId(memberId); + String walletFrozenBalance = memberMapper.selectWalletFrozenBalanceBymemberId(memberId); + + memberAccountInfoVo.setWalletCoinAvailableBalance(new BigDecimal(walletAvailableBalance)); + memberAccountInfoVo.setWalletCoinTotalBalance(new BigDecimal(walletTotalBalance)); + memberAccountInfoVo.setWalletCoinFrozenBalance(new BigDecimal(walletFrozenBalance)); Map<String, Object> columnMap = new HashMap<>(); columnMap.put("member_id", memberId); -- Gitblit v1.9.1