20200821

xiaoyong931011

2020-08-21 547ca3d0620fac74e1dbef77d81bf1142224b299

20200821

 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java

@@ -75,7 +75,6 @@
    }

    

    /**

     * --todo

     *  获取我的合约资产信息

     * @return

     */


 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/MemberWalletContractInfoVo.java

@@ -10,11 +10,14 @@
@ApiModel(value = "MemberWalletContractInfoVo", description = "合约账户信息返回")

public class MemberWalletContractInfoVo {

    

    /**

     * 用户Id

     */

    @ApiModelProperty(value = "用户Id")

    private Long memberId;

    @ApiModelProperty(value = "总资产USDT")

    private BigDecimal totalCoin;

	
    @ApiModelProperty(value = "总资产RMB")

    private BigDecimal availableCoin;

	
    @ApiModelProperty(value = "币种")

    private String symbol;

    

    /**

     * 可用余额


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

@@ -2,7 +2,10 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import javax.annotation.Resource;



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

@@ -181,23 +184,34 @@


        //获取用户ID

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



        PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();

        BigDecimal cnyUsdt = cnyUsdtExchange.getValue();

        Map<String, Object> columnMap = new HashMap<String, Object>();

        columnMap.put("member_id", memberId);

        List<MemberWalletContractEntity> selectByMap = memberWalletContractDao.selectByMap(columnMap);

        BigDecimal totalCoin = BigDecimal.ZERO;

		
        List<MemberWalletContractInfoVo> list = new ArrayList<>();

        if(CollUtil.isNotEmpty(selectByMap)) {

            for(MemberWalletContractEntity memberWalletContractEntity : selectByMap) {

                MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();

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

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

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

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

                memberWalletContractInfoVo.setSymbol(memberWalletContractEntity.getWalletCode());

                list.add(memberWalletContractInfoVo);

                totalCoin = totalCoin.add(memberWalletContractEntity.getTotalBalance());

            }

        }

		
        MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();

        memberWalletContractInfoVo.setTotalCoin(totalCoin.setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setAvailableCoin(totalCoin.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));

        memberWalletContractInfoVo.setSymbol("ALLCOIN");

        list.add(memberWalletContractInfoVo);



        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);

        if (ObjectUtil.isEmpty(walletContract)) {

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

        }



        MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();

        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);

        return Result.ok(list);

    }



    @Override