20200602 代码提交

xiaoyong931011

2020-06-02 987b08f018be10550d6f48242633bd9a1d85a865

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

@@ -98,7 +98,7 @@
   }



   @Override

   public Result enterTransactionPageOfWalletCoin(String symbol, String type) {

   public Result enterTransactionPageOfWalletCoin(String symbol) {

      if (StrUtil.isBlank(symbol)) {

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

      }

@@ -135,11 +135,8 @@
      // 手续费用率

      transactionPageOfWalletCoinVo.setFeeRatio(tradeSetting.getFeeRatio().setScale(4, BigDecimal.ROUND_DOWN));

      // 用户可用金额

      if(MemberWalletCoinEnum.ENTERTRANSACTIONPAGEOFWALLETCOIN_BUY.getValue().equals(type)) {//买入

         transactionPageOfWalletCoinVo.setAvailableBalance(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      }else {

         transactionPageOfWalletCoinVo.setAvailableBalance(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      }

      transactionPageOfWalletCoinVo.setAvailableBalanceBuy(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      transactionPageOfWalletCoinVo.setAvailableBalanceSell(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      //当前价

      transactionPageOfWalletCoinVo.setCurrentPrice(closePrice.setScale(4, BigDecimal.ROUND_DOWN));

      //比例

@@ -148,7 +145,6 @@
      transactionPageOfWalletCoinVo.setCurrentPriceCny(cnyUsdt.multiply(closePrice).setScale(4, BigDecimal.ROUND_DOWN));

      

      transactionPageOfWalletCoinVo.setSymbol(symbol);

      transactionPageOfWalletCoinVo.setType(type);

      return Result.ok(transactionPageOfWalletCoinVo);

   }



@@ -395,14 +391,14 @@
   }



   @Override

   public Result findAllWalletCoinOrder() {

   public Result findAllWalletCoinOrder(String symbol) {

      //获取用户ID

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

      

      OrderWalletCoinDealListVo orderWalletCoinDealListVo = new OrderWalletCoinDealListVo();

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

      

      List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrder(memberId);

      List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrderBySymbol(memberId,symbol);

      if(CollUtil.isNotEmpty(selectAllWalletCoinOrder)) {

         for(OrderCoinsDealEntity orderCoinsDealEntity: selectAllWalletCoinOrder) {

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