20200527 代码提交

xiaoyong931011

2020-05-27 db34efa087eac4f89a2ae5911ffba9b32797024e

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

@@ -35,6 +35,7 @@
import com.xcong.excoin.modules.coin.parameter.vo.MemberSelectSymbolsVo;

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

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

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

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

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

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

@@ -102,7 +103,7 @@
      MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);

      

      PlatformTradeSettingEntity tradeSetting = platformTradeSettingDao.findTradeSetting();

      if (tradeSetting == null) {

      if (ObjectUtil.isEmpty(tradeSetting)) {

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

      }

      //获取USDT的币币账户信息

@@ -144,6 +145,9 @@
      transactionPageOfWalletCoinVo.setCnyUsdt(cnyUsdt.setScale(4, BigDecimal.ROUND_DOWN));

      //换算成人民币的币种价格

      transactionPageOfWalletCoinVo.setCurrentPriceCny(cnyUsdt.multiply(closePrice).setScale(4, BigDecimal.ROUND_DOWN));

		
      transactionPageOfWalletCoinVo.setSymbol(symbol);

      transactionPageOfWalletCoinVo.setType(type);

      return Result.ok(transactionPageOfWalletCoinVo);

   }



@@ -301,10 +305,18 @@
   public Result getEntrustWalletCoinOrder(String symbol, Integer status) {

      //获取用户ID

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

      OrderWalletCoinListVo orderWalletCoinListVo = new OrderWalletCoinListVo();

      

      OrderCoinsEntity orderCoin = orderCoinsDao.findCoinOrderListByMemberIdAndSysmbol(memberId, symbol, status);

      OrderWalletCoinVo entityToVo = OrderWalletCoinMapper.INSTANCE.entityToVo(orderCoin);

      return Result.ok(entityToVo);

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

      List<OrderCoinsEntity> findCoinOrderListByMemberIdAndSysmbol = orderCoinsDao.findCoinOrderListByMemberIdAndSysmbol(memberId, symbol, status);

      if(CollUtil.isNotEmpty(findCoinOrderListByMemberIdAndSysmbol)) {

         for(OrderCoinsEntity orderCoinsEntity : findCoinOrderListByMemberIdAndSysmbol) {

            OrderWalletCoinVo entityToVo = OrderWalletCoinMapper.INSTANCE.entityToVo(orderCoinsEntity);

            arrayList.add(entityToVo);

         }

      }

      orderWalletCoinListVo.setOrderWalletCoinVo(arrayList);

      return Result.ok(arrayList);

   }



   @Override

@@ -397,7 +409,7 @@
      List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrder(memberId);

      if(CollUtil.isNotEmpty(selectAllWalletCoinOrder)) {

         for(OrderCoinsDealEntity orderCoinsDealEntity: selectAllWalletCoinOrder) {

            OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVo(orderCoinsDealEntity);

            OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(orderCoinsDealEntity);

            arrayList.add(entityToVo);

         }

      }

@@ -410,7 +422,7 @@
      //获取用户ID

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

      OrderCoinsDealEntity selectWalletCoinOrder = orderCoinDealDao.selectWalletCoinOrder(orderId,memberId);

      OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVo(selectWalletCoinOrder);

      OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(selectWalletCoinOrder);

      return Result.ok(entityToVo);

   }



@@ -428,6 +440,7 @@
      }else {

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

         columnMap.put("symbol", symbol);

         columnMap.put("member_id", memberId);

         memberSelectSymbolsDao.deleteByMap(columnMap);;

         return Result.ok(MessageSourceUtils.getString("order_service_0016"));

      }