20200525 代码提交

xiaoyong931011

2020-05-25 ecee66faf0829070691267037c25f771ea3edd7f

20200525    代码提交

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

New file
@@ -0,0 +1,81 @@
package com.xcong.excoin.modules.coin.parameter.vo;



import java.math.BigDecimal;



import io.swagger.annotations.ApiModelProperty;



public class MemberWalletCoinInfoVo {



    /**

     * 用户Id

     */

    @ApiModelProperty(value = "用户Id")

    private Long memberId;

    
    /**

     * 钱包标识

     */

    @ApiModelProperty(value = "币种名称")

    private String walletCode;



    /**

     * 可用余额

     */

    @ApiModelProperty(value = "可用余额")

    private BigDecimal availableBalance;



    /**

     * 总金额

     */

    @ApiModelProperty(value = "总金额")

    private BigDecimal totalBalance;



    /**

     * 冻结金额

     */

    @ApiModelProperty(value = "冻结金额")

    private BigDecimal frozenBalance;

    
    public String getWalletCode() {

        return walletCode;

    }



    public void setWalletCode(String walletCode) {

        this.walletCode = walletCode;

    }



    public Long getMemberId() {

        return memberId;

    }



    public void setMemberId(Long memberId) {

        this.memberId = memberId;

    }



    public BigDecimal getAvailableBalance() {

        return availableBalance;

    }



    public void setAvailableBalance(BigDecimal availableBalance) {

        this.availableBalance = availableBalance;

    }



    public BigDecimal getTotalBalance() {

        return totalBalance;

    }



    public void setTotalBalance(BigDecimal totalBalance) {

        this.totalBalance = totalBalance;

    }



    public BigDecimal getFrozenBalance() {

        return frozenBalance;

    }



    public void setFrozenBalance(BigDecimal frozenBalance) {

        this.frozenBalance = frozenBalance;

    }



    


}


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

@@ -3,8 +3,6 @@
import java.math.BigDecimal;

import java.util.List;



import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;



import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;



@@ -23,7 +21,7 @@
    private BigDecimal totalCny;

    

    @ApiModelProperty(value = "币种详情")

    private List<MemberWalletCoinEntity> walletCoinEntities;

    private List<MemberWalletCoinInfoVo> memberWalletCoinInfoVo;

    

    public BigDecimal getTotalUsdt() {

        return totalUsdt;

@@ -37,11 +35,11 @@
    public void setTotalCny(BigDecimal totalCny) {

        this.totalCny = totalCny;

    }

    public List<MemberWalletCoinEntity> getWalletCoinEntities() {

        return walletCoinEntities;

    public List<MemberWalletCoinInfoVo> getMemberWalletCoinInfoVo() {

        return memberWalletCoinInfoVo;

    }

    public void setWalletCoinEntities(List<MemberWalletCoinEntity> walletCoinEntities) {

        this.walletCoinEntities = walletCoinEntities;

    public void setMemberWalletCoinInfoVo(List<MemberWalletCoinInfoVo> memberWalletCoinInfoVo) {

        this.memberWalletCoinInfoVo = memberWalletCoinInfoVo;

    }



}


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

@@ -18,6 +18,7 @@
import com.xcong.excoin.modules.coin.dao.platform.CnyUsdtExchangeDao;

import com.xcong.excoin.modules.coin.entity.CnyUsdtExchange;

import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinInfoVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletCoinVo;

import com.xcong.excoin.modules.coin.service.CoinService;

import com.xcong.excoin.modules.member.dao.MemberWalletAgentDao;

@@ -60,10 +61,23 @@
            

            if(!StrUtil.isEmpty(memberId.toString())) {

                

                List<MemberWalletCoinEntity> MemberWalletCoinlist = memberWalletCoinDao.selectMemberWalletCoinsByMemberId(memberId);

                List<MemberWalletCoinEntity> memberWalletCoinlist = memberWalletCoinDao.selectMemberWalletCoinsByMemberId(memberId);

                

                if(CollUtil.isNotEmpty(MemberWalletCoinlist)) {

                    for(MemberWalletCoinEntity walletCoin : MemberWalletCoinlist) {

                List<MemberWalletCoinInfoVo> memberWalletCoinInfoVolist = new ArrayList<MemberWalletCoinInfoVo>();

                MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();

                if(ObjectUtil.isNotEmpty(memberWalletCoinlist)) {

                    for(MemberWalletCoinEntity memberWalletCoinEntity : memberWalletCoinlist) {

                        memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance());

                        memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance());

                        memberWalletCoinInfoVo.setMemberId(memberWalletCoinEntity.getMemberId());

                        memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance());

                        memberWalletCoinInfoVolist.add(memberWalletCoinInfoVo);

                    }

                }

				
				
                if(CollUtil.isNotEmpty(memberWalletCoinlist)) {

                    for(MemberWalletCoinEntity walletCoin : memberWalletCoinlist) {

                        if(MemberWalletCoinEnum.WALLETCOINCODE.getValue().equals(walletCoin.getWalletCode())) {    

                            totalUsdt = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());

                            BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);

@@ -80,34 +94,35 @@
                MemberWalletCoinVo memberWalletCoinVo = new MemberWalletCoinVo();

                memberWalletCoinVo.setTotalUsdt(totalUsdt.setScale(4, BigDecimal.ROUND_DOWN));

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

                memberWalletCoinVo.setWalletCoinEntities(MemberWalletCoinlist);

                memberWalletCoinVo.setMemberWalletCoinInfoVo(memberWalletCoinInfoVolist);

                return Result.ok(memberWalletCoinVo);

            }else {

                List<MemberWalletCoinEntity> MemberWalletCoinlist = new ArrayList<MemberWalletCoinEntity>();

                MemberWalletCoinEntity coin = new MemberWalletCoinEntity();

                List<MemberWalletCoinInfoVo> memberWalletCoinlist = new ArrayList<MemberWalletCoinInfoVo>();

                MemberWalletCoinInfoVo coin = new MemberWalletCoinInfoVo();

                coin.setAvailableBalance(BigDecimal.ZERO);

                coin.setTotalBalance(BigDecimal.ZERO);

                coin.setFrozenBalance(BigDecimal.ZERO);

                coin.setWalletCode(CoinTypeEnum.BTC.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.ETH.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.LTC.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.BCH.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.USDT.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.EOS.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.XRP.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

                coin.setWalletCode(CoinTypeEnum.ETC.toString());

                MemberWalletCoinlist.add(coin);

                memberWalletCoinlist.add(coin);

				
                MemberWalletCoinVo memberWalletCoinVo = new MemberWalletCoinVo();

                memberWalletCoinVo.setTotalUsdt(totalUsdt.setScale(4, BigDecimal.ROUND_DOWN));

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

                memberWalletCoinVo.setWalletCoinEntities(MemberWalletCoinlist);

                memberWalletCoinVo.setMemberWalletCoinInfoVo(memberWalletCoinlist);;

                return Result.ok(memberWalletCoinVo);

            }

        } catch (Exception e) {