20200525

xiaoyong931011

2020-05-25 ee5c6327f939b3df45f701266ce1e93bbef2c0f1

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

@@ -2,9 +2,7 @@


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 org.springframework.stereotype.Service;

@@ -18,8 +16,11 @@
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.MemberAccountMoneyChangeInfoVo;

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

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

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

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

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

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

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

@@ -65,12 +66,13 @@
            

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

            MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();

            if(ObjectUtil.isNotEmpty(memberWalletCoinlist)) {

            if(CollUtil.isNotEmpty(memberWalletCoinlist)) {

               for(MemberWalletCoinEntity memberWalletCoinEntity : memberWalletCoinlist) {

                  memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance());

                  memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance());

                  memberWalletCoinInfoVo.setMemberId(memberWalletCoinEntity.getMemberId());

                  memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance());

                  memberWalletCoinInfoVo.setWalletCode(memberWalletCoinEntity.getWalletCode());

                  memberWalletCoinInfoVolist.add(memberWalletCoinInfoVo);

               }

            }

@@ -185,9 +187,6 @@
         BigDecimal profitAndLoss = new BigDecimal("50.000");

         //获取总付款

         BigDecimal totalPayment = new BigDecimal("50.000");

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

			
         BigDecimal lastTotalBalance = new BigDecimal("0");

         BigDecimal totalBalance = walletContract.getTotalBalance();

         lastTotalBalance = totalBalance.add(profitAndLoss);

@@ -195,14 +194,13 @@
            lastTotalBalance = new BigDecimal("0");

         }

         

         walletContract.setAvailableBalance(walletContract.getAvailableBalance());

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

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

         

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

         map.put(MemberWalletCoinEnum.WALLETCOINUSDT.getValue(), lastTotalBalance.setScale(4, BigDecimal.ROUND_DOWN));

         map.put(MemberWalletCoinEnum.WALLETCONTRACT.getValue(), walletContract);

         map.put(MemberWalletCoinEnum.WALLETCOINCNY.getValue(), lastTotalBalance.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));

         return Result.ok(map);

         return Result.ok(memberWalletContractInfoVo);

   }



   @Override

@@ -331,8 +329,8 @@
      Long memberId = LoginUserUtils.getAppLoginUser().getId();

      String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

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

		
      return Result.ok(walletContract);

      BigDecimal availableBalance = walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN);

      return Result.ok(availableBalance);

   }



   @Override

@@ -342,26 +340,50 @@
      

      MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);

      BigDecimal availableBalance = walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN);

      walletCoin.setAvailableBalance(availableBalance);

      return Result.ok(walletCoin);

      return Result.ok(availableBalance);

   }



   @Override

   public Result getWalletCoinRecords() {

      //获取用户ID

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

		
      List<MemberAccountMoneyChange> coinRecordList = memberAccountMoneyChangeDao.selectWalletCoinRecordsByMemIdTypeSymbol(memberId);

      return Result.ok(coinRecordList);

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

      if(ObjectUtil.isNotNull(coinRecordList)) {

         for(MemberAccountMoneyChange memberAccountMoneyChange : coinRecordList) {

            MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();

            memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());

            memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());

            memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());

            memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());

            memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());

            arrayList.add(memberAccountMoneyChangeInfoVo);

         }

      }

      return Result.ok(arrayList);

   }



   @Override

   public Result getWalletContractRecords(String symbol) {

   public Result getWalletContractRecords() {

      //获取用户ID

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

		
      String symbol = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

      List<MemberAccountMoneyChange> contractRecordList = memberAccountMoneyChangeDao.selectWalletContractRecordsByMemIdTypeSymbol(symbol,memberId);

      return Result.ok(contractRecordList);

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

            arrayList.add(memberAccountMoneyChangeInfoVo);

         }

      }

		
      return Result.ok(arrayList);

   }



   @Override

@@ -371,7 +393,20 @@
      

      List<MemberAccountMoneyChange> contractRecordList = 

            memberAccountMoneyChangeDao.selectWalletAgentRecordByMemIdTypeSymbol(MemberWalletCoinEnum.WALLETCOINCODE.getValue(),memberId);

      return Result.ok(contractRecordList);

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

            arrayList.add(memberAccountMoneyChangeInfoVo);

         }

      }

      return Result.ok(arrayList);

   }



   @Override

@@ -472,15 +507,12 @@
      

      CnyUsdtExchange cnyUsdtExchange =cnyUsdtExchangeDao.getCNYAndUSDTOne();

      BigDecimal cnyUsdt = cnyUsdtExchange.getValue();

		
      BigDecimal multiply = availableBalance.multiply(cnyUsdt);

      

      walletAgent.setAvailableBalance(availableBalance);

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

      map.put(MemberWalletCoinEnum.WALLETCOINUSDT.getValue(), availableBalance.setScale(4, BigDecimal.ROUND_DOWN));

      map.put(MemberWalletCoinEnum.WALLETAGENT.getValue(), walletAgent);

      map.put(MemberWalletCoinEnum.WALLETCOINCNY.getValue(),  multiply.setScale(4, BigDecimal.ROUND_DOWN));

      return Result.ok(map);

      MemberWalletAgentInfoVo memberWalletAgentInfoVo = new MemberWalletAgentInfoVo();

      memberWalletAgentInfoVo.setTotalBalance(availableBalance.setScale(4, BigDecimal.ROUND_DOWN));

      memberWalletAgentInfoVo.setTotalRMBBalance(multiply.setScale(4, BigDecimal.ROUND_DOWN));

      return Result.ok(memberWalletAgentInfoVo);

   }



}