20200529 代码提交

xiaoyong931011

2020-05-29 8091536e331c6c7f8a094ec86ef32fd718170797

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

@@ -321,10 +321,10 @@


   @Override

   @Transactional

   public Result cancelEntrustWalletCoinOrder(String orderNo) {

   public Result cancelEntrustWalletCoinOrder(String orderId) {

         //获取用户ID

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

         OrderCoinsEntity orderCoinsEntity = orderCoinsDao.findWalletCoinOrderByOrderNo(orderNo);

         OrderCoinsEntity orderCoinsEntity = orderCoinsDao.selectById(orderId);

            if(ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId() == memberId) {

               if(orderCoinsEntity.getOrderStatus() == OrderCoinsEntity.ORDERSTATUS_CANCEL){

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

@@ -342,7 +342,7 @@
                  if (ObjectUtil.isNotEmpty(walletCoin)) {

                     //手续费 = 开仓价*数量*手续费率

                     //返还金额=开仓价*未成交数量+手续费

                     BigDecimal returnBalance = orderCoinsEntity.getEntrustPrice().add(orderCoinsEntity.getFeeAmount());

                     BigDecimal returnBalance = orderCoinsEntity.getDealAmount().add(orderCoinsEntity.getFeeAmount());

                     

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

                     walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

@@ -360,13 +360,12 @@
                  }

               }else {

                  //如果是限价卖出，撤单将对应的钱包冻结金额返回

                  String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

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

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

                  if (ObjectUtil.isNotEmpty(walletCoin)) {

                     //返还金额=开仓价*未成交数量

                     BigDecimal returnBalance = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());

                     walletCoin.setAvailableBalance(returnBalance.setScale(4, BigDecimal.ROUND_DOWN));

                     walletCoin.setFrozenBalance(BigDecimal.ZERO);

                     walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

                     memberWalletCoinDao.updateById(walletCoin);

                     // 流水记录

                     MemberAccountFlowEntity record = new MemberAccountFlowEntity();

@@ -380,7 +379,6 @@
                     return Result.ok(MessageSourceUtils.getString("order_service_0013"));

                  }

               }

					
               OrderCoinsDealEntity detail = new OrderCoinsDealEntity();

               detail.setMemberId(memberId);

               detail.setOrderId(orderCoinsEntity.getId());

@@ -388,6 +386,7 @@
               detail.setOrderType(orderCoinsEntity.getOrderType());

               detail.setTradeType(orderCoinsEntity.getTradeType());

               detail.setSymbol(symbol);

               detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_CANCEL);

               detail.setSymbolCnt(orderCoinsEntity.getEntrustCnt());

               detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice().setScale(4, BigDecimal.ROUND_DOWN));

               detail.setDealPrice(orderCoinsEntity.getDealPrice().setScale(4, BigDecimal.ROUND_DOWN));