归集修改

gao

2020-07-28 5393820239be024bd8cc6950ea0e17076d4cc21c

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -4,6 +4,7 @@
import java.util.ArrayList;

import java.util.List;

import javax.annotation.Resource;

import javax.validation.Valid;



import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;

import org.springframework.stereotype.Service;

@@ -139,7 +140,6 @@
            memberWalletCoinVo.setTotalUsdt(totalUsdts.setScale(4, BigDecimal.ROUND_DOWN));

            memberWalletCoinVo.setTotalCny(totalUsdts.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));

            memberWalletCoinVo.setMemberWalletCoinInfoVo(memberWalletCoinlist);

            ;

            return Result.ok(memberWalletCoinVo);

        }

    }

@@ -185,26 +185,12 @@
        if (ObjectUtil.isEmpty(walletContract)) {

            return Result.fail(MessageSourceUtils.getString("member_service_0001"));

        }

        /**

         * todo

         */

        //获取当前的合约持仓

        //获取实时盈亏

        BigDecimal profitAndLoss = new BigDecimal("0");

        //获取总付款

        BigDecimal totalPayment = new BigDecimal("0");

        BigDecimal lastTotalBalance = new BigDecimal("0");

        BigDecimal totalBalance = walletContract.getTotalBalance();

        lastTotalBalance = totalBalance.add(profitAndLoss);

        if (lastTotalBalance.compareTo(BigDecimal.ZERO) < 0) {

            lastTotalBalance = new BigDecimal("0");

        }



        MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();

        memberWalletContractInfoVo.setFrozenBalance(totalPayment.setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance());

        memberWalletContractInfoVo.setTotalBalance(lastTotalBalance.setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setTotalRMBBalance(lastTotalBalance.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setFrozenBalance(walletContract.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setTotalBalance(walletContract.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setTotalRMBBalance(walletContract.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));



        return Result.ok(memberWalletContractInfoVo);

    }

@@ -228,9 +214,6 @@
                return Result.fail(MessageSourceUtils.getString("member_service_0005"));

            }

            BigDecimal subtract = walletCoin.getTotalBalance().subtract(balance);

            if (subtract.compareTo(BigDecimal.ZERO) < 0) {

                return Result.fail(MessageSourceUtils.getString("member_service_0005"));

            }

            walletCoin.setAvailableBalance(total);

            walletCoin.setTotalBalance(subtract);

            int updateWalletCoinById = memberWalletCoinDao.updateById(walletCoin);

@@ -497,29 +480,34 @@
    }



   @Override

   public Result getWalletAgentIntoRecords() {

   public Result getWalletAgentIntoRecords(RecordsPageDto recordsPageDto) {

           //获取用户ID

           Long memberId = LoginUserUtils.getAppLoginUser().getId();



           List<MemberAccountMoneyChange> contractRecordList =

                   memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(memberId);



           MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();

	        
           Page<OrderCoinsDealEntity> page = new Page<>(recordsPageDto.getPageNum(), recordsPageDto.getPageSize());

           MemberAccountMoneyChange memberAccountMoneyChange = new MemberAccountMoneyChange();

           memberAccountMoneyChange.setMemberId(memberId);

           IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletAgentIntoRecordsByMemIdTypeSymbol(page, memberAccountMoneyChange);

           List<MemberAccountMoneyChange> contractRecordList = list.getRecords();

           List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();

           if (ObjectUtil.isNotNull(contractRecordList)) {

               for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {

                   MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

                   memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());

                   memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());

                   memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

                   memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

                   memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

                   memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());

                   arrayList.add(memberAccountMoneyChangeInfoVo);

               }

           if(CollUtil.isNotEmpty(contractRecordList)) {

              if (ObjectUtil.isNotNull(contractRecordList)) {

                 for (MemberAccountMoneyChange memberAccountMoneyChanges : contractRecordList) {

                    MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

                    memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChanges.getAmount());

                    memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChanges.getContent());

                    memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChanges.getStatus());

                    memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChanges.getSymbol());

                    memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChanges.getType());

                    memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChanges.getUpdateTime());

                    arrayList.add(memberAccountMoneyChangeInfoVo);

                 }

              }

           }

           memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);

           return Result.ok(memberAgentIntoInfoVo);

           Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = new Page<>();

           pageEntityToPageVo.setRecords(arrayList);

	        
           return Result.ok(pageEntityToPageVo);

   }



}